C. Scott Ananian [Tue, 23 Apr 2019 17:09:36 +0000 (13:09 -0400)]
Deprecate Sanitizer::setupAttributeWhitelist/attributeWhitelist
These methods should be made private in the next release, but
hard-deprecate them for 1.34.
Tweak the return value of the attribute whitelist to be an
associative rather than a sequential array, which makes the
lookup of allowed attributes more efficient and avoids an
array_flip for every html element sanitized.
Bug: T221677
Change-Id: I17d734937accec6c2679dbe17328cf9554bd556a
jenkins-bot [Thu, 20 Jun 2019 16:54:31 +0000 (16:54 +0000)]
Merge "Type hint against IResultWrapper in maintenance classes"
jenkins-bot [Thu, 20 Jun 2019 16:54:25 +0000 (16:54 +0000)]
Merge "Type hint against IResultWrapper in api classes"
jenkins-bot [Thu, 20 Jun 2019 16:26:37 +0000 (16:26 +0000)]
Merge "Remove $wgUseKeyHeader and OutputPage::getKeyHeader(), deprecated in 1.32"
jenkins-bot [Thu, 20 Jun 2019 16:24:00 +0000 (16:24 +0000)]
Merge "Remove OutputPage::addWikitext()* functions, hard-deprecated in 1.32"
jenkins-bot [Thu, 20 Jun 2019 16:21:48 +0000 (16:21 +0000)]
Merge "Update monolog/monolog from 1.22.1 -> 1.24.0"
Reedy [Thu, 20 Jun 2019 14:33:00 +0000 (15:33 +0100)]
Add some @since tags to ParserOutput::SUPPORTS_ constants
Change-Id: I2f6588fe563ed5c1dc5ef2a70e2ed59fdca99018
jenkins-bot [Thu, 20 Jun 2019 11:22:07 +0000 (11:22 +0000)]
Merge "resourceloader: Document which FileModule methods use a DB"
jenkins-bot [Thu, 20 Jun 2019 11:02:36 +0000 (11:02 +0000)]
Merge "Fix wfLocalFile() replacement"
jenkins-bot [Thu, 20 Jun 2019 10:50:10 +0000 (10:50 +0000)]
Merge "resourceloader: Switch Xml::encodeJsCall call in getDeprecationInformation"
Lucas Werkmeister [Thu, 20 Jun 2019 10:01:03 +0000 (12:01 +0200)]
Fix wfLocalFile() replacement
This bit of ImageListPager used to call wfLocalFile(), but was
accidentally replaced with the replacement for wfFindFile() instead.
Bug: T226102
Change-Id: Id50a5359fe2353ae88012d1f5a3331f570b73922
Kosta Harlan [Thu, 20 Jun 2019 01:43:47 +0000 (21:43 -0400)]
Disable flaky Selenium test
Change-Id: Ia3f2403e452f4476238b349c9d6a6f8135267456
Follows-Up: Iaf7e095b3bb34072eea6bcac76ba29358b14cc09
Bug: T226144
jenkins-bot [Thu, 20 Jun 2019 00:00:55 +0000 (00:00 +0000)]
Merge "AutoLoader: Skip tokenizing of irrelevant lines in ClassCollector"
Timo Tijhof [Wed, 19 Jun 2019 22:44:39 +0000 (23:44 +0100)]
resourceloader: Document which FileModule methods use a DB
Also, for the unit test, disable the two methods we use there
that can get called. The unintended side-effects of these two
methods was the only reason it used `@group Database`.
Removing that makes the test a bit faster as well.
Enforce this via MediaWikiServices for this suite to avoid an
untracked dependency slipping back in in the future.
Bug: T225730
Change-Id: I6c54466e9517d9899bc39f8f9bb946369c0a526d
Translation updater bot [Wed, 19 Jun 2019 21:35:03 +0000 (23:35 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I4b61ff429f73f4d8252206f6613551d20b5b230f
jenkins-bot [Wed, 19 Jun 2019 20:47:01 +0000 (20:47 +0000)]
Merge "Remove deprecated ApiAction logging code from ApiMain.php"
Umherirrender [Wed, 19 Jun 2019 19:43:51 +0000 (21:43 +0200)]
Type hint against IResultWrapper in api classes
Change-Id: If3870e6b8d343dd12390f5155d97edbbe080ac77
Umherirrender [Wed, 19 Jun 2019 19:42:32 +0000 (21:42 +0200)]
Type hint against IResultWrapper in maintenance classes
Change-Id: I6a58e9cfe645056a854c80b2db1e71fb59bd226b
jenkins-bot [Wed, 19 Jun 2019 19:32:17 +0000 (19:32 +0000)]
Merge "Reduce selector specificity"
C. Scott Ananian [Wed, 19 Jun 2019 18:22:42 +0000 (14:22 -0400)]
Remove $wgUseKeyHeader and OutputPage::getKeyHeader(), deprecated in 1.32
These implemented a since-abandoned draft IETF spec, and the code was
broken due to (1) case-(in)sensitivity issues with the Accept-Language
header and (2) the BCP47 language code compatibility workaround we use.
Change-Id: Ia53d07cd8ce8ab1497294ea244c13c7499f632c7
C. Scott Ananian [Wed, 19 Jun 2019 15:57:36 +0000 (11:57 -0400)]
Remove OutputPage::addWikitext()* functions, hard-deprecated in 1.32
This starts cleaning up the programmer-visible API for OutputPage
and removed some deprecated untidy parser modes.
Change-Id: Ib464b57248f114b68424ec1175d36ad86d1319ad
Matěj Suchánek [Wed, 19 Jun 2019 17:27:56 +0000 (19:27 +0200)]
Style change tags correctly on Special:Newpages
Bug: T212613
Change-Id: I6905273bf9bb3d93480df201a2935d8b0e831805
Aaron Schulz [Wed, 19 Jun 2019 16:05:16 +0000 (17:05 +0100)]
rdbms: deprecate unused ILoadBalancer::safeGetLag method
Change-Id: Ib3bc2862548271613da30ad1be836d28a82e6cc9
Timo Tijhof [Tue, 18 Jun 2019 17:26:06 +0000 (18:26 +0100)]
AutoLoader: Skip tokenizing of irrelevant lines in ClassCollector
This makes AutoLoaderStructureTest in PHPUnit and the
generateLocalAutoload.php maintenance script much faster.
On my machine, it made it 35X faster (or time spent reduced by 97%).
Bug: T225730
Change-Id: Ife959bd17ce9c2ae952dfbd158ddb3d8475e8cb2
Timo Tijhof [Wed, 19 Jun 2019 14:38:32 +0000 (15:38 +0100)]
resourceloader: Switch Xml::encodeJsCall call in getDeprecationInformation
Also rename one of the test classes to have a more descriptive name.
Bug: T32956
Change-Id: I1a970c198300b7ef0d99c15609f1fb7fa8783b98
jenkins-bot [Wed, 19 Jun 2019 14:10:33 +0000 (14:10 +0000)]
Merge "resourceloader: Define the default language and skin in constants"
Andrew Otto [Wed, 19 Jun 2019 14:05:50 +0000 (10:05 -0400)]
Remove deprecated ApiAction logging code from ApiMain.php
ApiAction was disabled in WMF production in
https://gerrit.wikimedia.org/r/c/operations/mediawiki-config/+/516303
Bug: T222267
Change-Id: I527811ef84506cf35fe7b9b981fb405776fceb1a
Fomafix [Sun, 16 Jun 2019 20:30:15 +0000 (22:30 +0200)]
resourceloader: Define the default language and skin in constants
This allows to use the default values at several places.
Change-Id: I53f29c2162c4cac9caf672e816ebfeb97c452389
jenkins-bot [Wed, 19 Jun 2019 13:27:07 +0000 (13:27 +0000)]
Merge "rdbms: mention wait time in LoadBalancer::safeWaitForMasterPos() error logging"
jenkins-bot [Wed, 19 Jun 2019 13:27:01 +0000 (13:27 +0000)]
Merge "rdbms: merge openConnection into getConnection in LoadBalancer"
jenkins-bot [Wed, 19 Jun 2019 12:40:12 +0000 (12:40 +0000)]
Merge "resourceloader: Migrate use of 'raw' modules to 'raw' requests"
jenkins-bot [Wed, 19 Jun 2019 12:26:04 +0000 (12:26 +0000)]
Merge "resourceloader: Remove redundant 'group' setting for StartupModule"
jenkins-bot [Wed, 19 Jun 2019 11:20:31 +0000 (11:20 +0000)]
Merge "resourceloader: Ignore coverage for getBaseModulesInternal() wrapper"
Aaron Schulz [Mon, 17 Jun 2019 18:16:12 +0000 (19:16 +0100)]
rdbms: merge openConnection into getConnection in LoadBalancer
Add error suppression feature to getConnection() itself so that
callers can easily be migrated to it. Deprecate openConnection(),
which is poorly named and had a poor division of responsibility
with getConnection().
Split out some new private methods for readability:
* sanitizeConnectionFlags(), which warns about and strips unusable flags
* enforceConnectionFlags(), which handles some DBO_TRX sanity logic
* lazyLoadReplicationPositions(), which handles the chronology callback
Make sure "waitForPos" is loaded before pickReaderIndex() so that the
optimization of being extra picky about replication lag (in seconds)
actually applies.
Change-Id: I225ed6e6edf39cdf237f2322ea59f35d30f2e01a
jenkins-bot [Wed, 19 Jun 2019 06:56:00 +0000 (06:56 +0000)]
Merge "phan: Add internal stubs for imagick, pcntl, redis & sockets"
Aaron Schulz [Wed, 19 Jun 2019 02:19:53 +0000 (03:19 +0100)]
rdbms: mention wait time in LoadBalancer::safeWaitForMasterPos() error logging
Change-Id: I134e58949bab25e73874ea29d1b306e4fffa6ef9
jenkins-bot [Wed, 19 Jun 2019 02:14:15 +0000 (02:14 +0000)]
Merge "language: Move some language-related classes to includes/language/"
jenkins-bot [Wed, 19 Jun 2019 02:11:22 +0000 (02:11 +0000)]
Merge "Various cleanups to MediaWiki::preOutputCommit"
jenkins-bot [Wed, 19 Jun 2019 01:35:47 +0000 (01:35 +0000)]
Merge "Use UUIDv4 for mediawiki.api-request log event ID."
jenkins-bot [Wed, 19 Jun 2019 01:25:09 +0000 (01:25 +0000)]
Merge "Fix return type of UploadStash::listFiles"
Petr Pchelko [Wed, 15 May 2019 05:06:09 +0000 (07:06 +0200)]
Use UUIDv4 for mediawiki.api-request log event ID.
Bug: T222966
Change-Id: Ie753229ed15545a62349154d442ae9e297951455
jenkins-bot [Tue, 18 Jun 2019 23:40:01 +0000 (23:40 +0000)]
Merge "Use IDatabase as return type for BotPassword::getDB"
jenkins-bot [Tue, 18 Jun 2019 22:59:07 +0000 (22:59 +0000)]
Merge "resourceloader: Skip modules with circular deps in tree optimiser"
Timo Tijhof [Thu, 13 Jun 2019 21:02:36 +0000 (22:02 +0100)]
language: Move some language-related classes to includes/language/
Bug: T225756
Change-Id: Ica351483d83a3a912d58ebb194b30828541fbcf3
jenkins-bot [Tue, 18 Jun 2019 20:34:15 +0000 (20:34 +0000)]
Merge "rdbms: Fix return type of DatabaseMysqlBase::mysqlFetchArray"
jenkins-bot [Tue, 18 Jun 2019 20:33:42 +0000 (20:33 +0000)]
Merge "resourceloader: Fix return type in ResourceLoader-related classes"
Timo Tijhof [Thu, 13 Jun 2019 18:28:38 +0000 (19:28 +0100)]
resourceloader: Ignore coverage for getBaseModulesInternal() wrapper
The getBaseModules() method is covered already.
Change-Id: I92d9063b72cee9e3be7329927bf5b97028399c14
Umherirrender [Tue, 18 Jun 2019 20:18:49 +0000 (22:18 +0200)]
rdbms: Fix return type of DatabaseMysqlBase::mysqlFetchArray
Change-Id: I7797ae79e8b4c1a88a4f1da342ef4a4f5a78ed74
Umherirrender [Tue, 18 Jun 2019 20:17:41 +0000 (22:17 +0200)]
resourceloader: Fix return type in ResourceLoader-related classes
Change-Id: I543e321129cf8fadc1159017b622528f462ea116
Umherirrender [Tue, 18 Jun 2019 19:40:09 +0000 (21:40 +0200)]
Use IDatabase as return type for BotPassword::getDB
There is no guarantee that this is a maintenance able connection,
but drop, create or alter is also not needed in this case
Change-Id: I7dd294b3d28ef8c4e416e826f38ed39f824b2f8f
jenkins-bot [Tue, 18 Jun 2019 19:38:45 +0000 (19:38 +0000)]
Merge "Return null from overwritten FormlessAction::onView"
jenkins-bot [Tue, 18 Jun 2019 19:38:39 +0000 (19:38 +0000)]
Merge "Update type of PermissionManager::resultToError"
jenkins-bot [Tue, 18 Jun 2019 19:38:33 +0000 (19:38 +0000)]
Merge "Fix return type of GenerateSitemap::getPageRes"
jenkins-bot [Tue, 18 Jun 2019 19:35:14 +0000 (19:35 +0000)]
Merge "Fix return type of CeeFormatter::format"
Kunal Mehta [Tue, 18 Jun 2019 19:19:37 +0000 (15:19 -0400)]
phan: Add internal stubs for imagick, pcntl, redis & sockets
Phan will automatically use these stubs if the extensions are not installed.
Also added a brief README for how to generate the stubs in the first place.
Bug: T224893
Change-Id: I1d31d03801fbc7b18dfc758453c95439acd96d19
Umherirrender [Tue, 18 Jun 2019 19:13:10 +0000 (21:13 +0200)]
Fix return type of CeeFormatter::format
FormatterInterface defines the return type as mixed
Change-Id: I41735b9fe887f9436cf6294a46eb5419c8da251f
Umherirrender [Tue, 18 Jun 2019 19:10:39 +0000 (21:10 +0200)]
Return null from overwritten FormlessAction::onView
The abstract class is documented to use null for doing nothing, not void
Change-Id: I99f0747117f83f4f2ae554c759a8e1737e7dc8f7
Umherirrender [Tue, 18 Jun 2019 18:33:53 +0000 (20:33 +0200)]
Fix return type of UploadStash::listFiles
SpecialUploadStash is using the return and already checking for truthy
Change-Id: Ie26f327d5ec9d67c39cf757591d2a779aecda86f
jenkins-bot [Tue, 18 Jun 2019 18:32:40 +0000 (18:32 +0000)]
Merge "ApiCSPReport: Support origin/path matching for false positives"
Umherirrender [Tue, 18 Jun 2019 18:28:37 +0000 (20:28 +0200)]
Fix return type of GenerateSitemap::getPageRes
Change-Id: I68729366f294b93aab5d2c76581c0847c11076d7
jenkins-bot [Tue, 18 Jun 2019 18:19:52 +0000 (18:19 +0000)]
Merge "ApiCSPReport: Log user ID instead of name, and limit urls to origin"
jenkins-bot [Tue, 18 Jun 2019 16:00:41 +0000 (16:00 +0000)]
Merge "WebInstaller: Add ARIA `role="main"` to overall div"
jenkins-bot [Tue, 18 Jun 2019 15:48:54 +0000 (15:48 +0000)]
Merge "Introduce separate unit tests PHPUnit configuration"
Volker E [Tue, 18 Jun 2019 00:23:13 +0000 (17:23 -0700)]
WebInstaller: Add ARIA `role="main"` to overall div
Adding ARIA `main` role on appropriate element to keep in sync with
WMF deployed themes.
Change-Id: I9436fd4478e2b108a7ec588db0a628d7d5c26fcd
Máté Szabó [Mon, 17 Jun 2019 21:15:25 +0000 (23:15 +0200)]
Introduce separate unit tests PHPUnit configuration
This changeset lays down the basic groundwork required to implement
T89432 and related tickets and is based on exploration done
at the Prague Hackathon. The goal is to identify tests in MediaWiki core
that can be run without having to install & configure MediaWiki and its dependencies,
and provide a way to execute these tests via the standard phpunit entry point,
allowing for faster development and integration with existing tooling like IDEs.
This changeset creates a new subdirectory under phpunit/ and organizes it
into a separate test suite. The environment for this suite is set up
via a PHPUnit bootstrap file without a custom entry point. For B/C, this
directory is also registered in suite.xml, to ensure that existing CI jobs
still pick up tests in the new suite.
For initial testing, a single test class, PasswordFactoryTest, was moved
to this new suite.
You can run the new suite using the follwoing command:
$ vendor/bin/phpunit -d memory_limit=512M -c tests/phpunit/unit-tests.xml
Bug: T84948
Bug: T89432
Bug: T87781
Change-Id: I69b92db3e70093570e05cc0a64c7780a278b321a
Umherirrender [Fri, 8 Jun 2018 20:16:21 +0000 (22:16 +0200)]
rdbms: Document varargs for IDatabase::buildLike
This is needed in order for Phan not to consider calls to
IDatabase::buildLike as invalid. Interestingly, it does not
consider calls to Database::buildLike invalid.
Bug: T191668
Change-Id: I0e027f5ec66d20b1d11e3441086001f6a751e1f5
Aaron Schulz [Tue, 18 Jun 2019 10:46:40 +0000 (11:46 +0100)]
Various cleanups to MediaWiki::preOutputCommit
Do not send headers if they were already flushed. Split off some
chronology protection logic into a separate private method. Use
ILBFactory over LBFactory in a few places. Also, update various
code comments.
Bug: T225655
Change-Id: Iecb574e11d8ba09147ff7b84ad57d8845069ba99
jenkins-bot [Tue, 18 Jun 2019 06:10:51 +0000 (06:10 +0000)]
Merge "Add link trail for Azerbaijani language"
Volker E [Tue, 18 Jun 2019 02:25:39 +0000 (19:25 -0700)]
Reduce selector specificity
Adapt to current Vector code.
Change-Id: Ie5a13f927810cea465fa984c68cdef3664042a41
jenkins-bot [Tue, 18 Jun 2019 01:30:50 +0000 (01:30 +0000)]
Merge "shell: Remove documentation that doesn't add meaning to the method"
Timo Tijhof [Tue, 18 Jun 2019 00:00:41 +0000 (01:00 +0100)]
DevelopmentSettings: Document why wgRateLimits is disabled
Follows-up
9c52f982d8.
Bug: T225796
Change-Id: I6f7a75d58c61712233134a9d480ce68719d6cb6a
jenkins-bot [Mon, 17 Jun 2019 23:50:43 +0000 (23:50 +0000)]
Merge "Remove unused/deprecated Replacer classes"
jenkins-bot [Mon, 17 Jun 2019 23:36:33 +0000 (23:36 +0000)]
Merge "Installer: Use HTML/CSS instead of JavaScript to toggle the help message"
jenkins-bot [Mon, 17 Jun 2019 22:55:20 +0000 (22:55 +0000)]
Merge "Add a report about slow PHPUnit tests"
Max Semenik [Sun, 16 Jun 2019 06:11:50 +0000 (23:11 -0700)]
Add a report about slow PHPUnit tests
johnkary/phpunit-speedtrap prints this information right before the
test results.
Bug: T225730
Change-Id: I288dcd6b3c9b2c0b31c6047eaf48a23e13af726e
Translation updater bot [Mon, 17 Jun 2019 20:06:02 +0000 (22:06 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I78a1cea264df6fa322b5df4a342882fb867a2c1a
jenkins-bot [Mon, 17 Jun 2019 20:00:45 +0000 (20:00 +0000)]
Merge "Use [...] instead of array(...) in PHP comments and documentation"
Kunal Mehta [Mon, 17 Jun 2019 19:23:06 +0000 (15:23 -0400)]
Remove unused/deprecated Replacer classes
Change-Id: Ifec6c624810b2354f2fab2c1fd4a27267b625c4b
jenkins-bot [Mon, 17 Jun 2019 19:39:03 +0000 (19:39 +0000)]
Merge "Installer: Make short header and normal header of WebInstaller equivalent"
Fomafix [Fri, 14 Jun 2019 09:07:33 +0000 (11:07 +0200)]
Installer: Make short header and normal header of WebInstaller equivalent
Change-Id: I8ae0cca582c2dab87a4b3b050030f6c96897939e
Fomafix [Mon, 16 Jan 2017 15:42:53 +0000 (16:42 +0100)]
Use [...] instead of array(...) in PHP comments and documentation
Change-Id: I0c83783051bf35fe785bc01644eeb2946902b6b2
jenkins-bot [Mon, 17 Jun 2019 18:35:34 +0000 (18:35 +0000)]
Merge "Fix some issues with HTMLSelectAndOtherField default and validation"
jenkins-bot [Mon, 17 Jun 2019 18:02:31 +0000 (18:02 +0000)]
Merge "resourceloader: Remove unused static $contexts var in ResourceLoaderImageTest"
jenkins-bot [Mon, 17 Jun 2019 17:59:44 +0000 (17:59 +0000)]
Merge "FileRepo: Use Late Static Binding in File static constructors"
Fomafix [Sun, 16 Jun 2019 11:59:59 +0000 (13:59 +0200)]
resourceloader: Remove unused static $contexts var in ResourceLoaderImageTest
Change-Id: I95abbfd6d2baafb9378072fdf1a1fc5ed046cec3
jenkins-bot [Mon, 17 Jun 2019 17:20:47 +0000 (17:20 +0000)]
Merge "Filter out blocks with duplicate IDs when checking for blocks"
jenkins-bot [Mon, 17 Jun 2019 16:48:05 +0000 (16:48 +0000)]
Merge "rdbms: clean up and simplify toString() handle for Database"
Derick Alangi [Mon, 17 Jun 2019 16:40:37 +0000 (17:40 +0100)]
shell: Remove documentation that doesn't add meaning to the method
Change-Id: I924453f683f058586516bb12e54940449d29cfd9
Thalia [Mon, 17 Jun 2019 09:56:49 +0000 (10:56 +0100)]
Filter out blocks with duplicate IDs when checking for blocks
Bug: T225919
Change-Id: I76549072d53083e6057f4fd8fe963e8989daa25c
jenkins-bot [Mon, 17 Jun 2019 11:11:45 +0000 (11:11 +0000)]
Merge "[bugfix] Fetch tag ID before calling undefineTag()"
Leszek Manicki [Mon, 17 Jun 2019 09:11:39 +0000 (11:11 +0200)]
Disable rate limiting in Development Settings
Bug: T225796
Change-Id: I2475a04066d4aaefeba372bd223ef68548a8cf18
jenkins-bot [Mon, 17 Jun 2019 07:54:27 +0000 (07:54 +0000)]
Merge "Fix param type of search terms in search related classes"
jenkins-bot [Mon, 17 Jun 2019 01:53:48 +0000 (01:53 +0000)]
Merge "rdbms: allow synchronous=OFF for sqlite"
jenkins-bot [Mon, 17 Jun 2019 01:03:47 +0000 (01:03 +0000)]
Merge "search: clean up some type hints in search classes"
jenkins-bot [Mon, 17 Jun 2019 00:50:47 +0000 (00:50 +0000)]
Merge "rdbms: do not close the connection in LoadBalancerSingle::__destruct"
Aaron Schulz [Mon, 17 Jun 2019 00:47:32 +0000 (01:47 +0100)]
rdbms: allow synchronous=OFF for sqlite
Change-Id: I58be09bb170399f3ad94fc3bcc4881932d357a9b
Aaron Schulz [Sun, 16 Jun 2019 22:13:02 +0000 (23:13 +0100)]
search: clean up some type hints in search classes
Change-Id: I357a78b42ea02a63c3b64e8982f04314cbbfdf9f
Aaron Schulz [Sun, 16 Jun 2019 23:20:55 +0000 (00:20 +0100)]
rdbms: do not close the connection in LoadBalancerSingle::__destruct
The connection instance is injected unlike with the parent class,
meaning that it does not own the connection. No-op the method.
Change-Id: I61914b986619f201ac9cc8c94d46873a3b9e8177
Kosta Harlan [Sun, 16 Jun 2019 23:00:52 +0000 (19:00 -0400)]
Only attempt to deduplicate if there is data in archive and revision
The idea is to avoid expensive calls to makeDummyRevisionRow, and speed up
installation of MediaWiki on CI.
Bug: T225901
Change-Id: I6f69281568218c89eb18353c06cabf7eb1926de8
Translation updater bot [Sun, 16 Jun 2019 20:01:56 +0000 (22:01 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I84ab99cdcd91ee6dab8ae284e8b1c6aea53cefac