jenkins-bot [Tue, 5 Jan 2016 23:19:27 +0000 (23:19 +0000)]
Merge "Make Maintenance::commitTransaction() do slave wait checks"
jenkins-bot [Tue, 5 Jan 2016 22:56:55 +0000 (22:56 +0000)]
Merge "Add wikipage.categories hook"
Derk-Jan Hartman [Sun, 21 Jun 2015 16:59:20 +0000 (18:59 +0200)]
Add wikipage.categories hook
This will be especially useful for HotCat.
Bug: T53583
Change-Id: Id944029df180c80502840c118a58013ebb717e1f
Fomafix [Tue, 3 Mar 2015 14:03:52 +0000 (14:03 +0000)]
mediawiki.inspect: Use binary prefixes for human sizes
https://en.wikipedia.org/wiki/Binary_prefix
Bug: T54687
Change-Id: I53c7e388fad54c317d99adcf9d222d8db05591e3
jenkins-bot [Tue, 5 Jan 2016 22:34:49 +0000 (22:34 +0000)]
Merge "Remove WaitForSlave maintenance script"
jenkins-bot [Tue, 5 Jan 2016 22:23:55 +0000 (22:23 +0000)]
Merge "Documentation: Remove paragraph about not creating a 2nd WebRequest"
Chad Horohoe [Tue, 5 Jan 2016 22:13:55 +0000 (14:13 -0800)]
Remove WaitForSlave maintenance script
Maxlag param for wfWaitForSlaves has been deprecated.
Change-Id: I61c09266848e248a28510e267e73ff7177d51bc0
Translation updater bot [Tue, 5 Jan 2016 21:02:49 +0000 (22:02 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: If70d2fec320a7741ad1fe6b2490e17a97164ae51
Alex Monk [Tue, 5 Jan 2016 17:16:44 +0000 (09:16 -0800)]
Mark AjaxExportList config as deprecated
Bug: T42786
Change-Id: Ia1b3aab2f1247190522dbdb779029d7117321bc0
jenkins-bot [Tue, 5 Jan 2016 14:23:10 +0000 (14:23 +0000)]
Merge "PHPUnit: Added test for unknown tags"
jenkins-bot [Tue, 5 Jan 2016 14:23:06 +0000 (14:23 +0000)]
Merge "Tests: Reflect recent changes to MediaWiki import structure"
georggi [Tue, 5 Jan 2016 12:02:03 +0000 (14:02 +0200)]
PHPUnit: Added test for unknown tags
Bug: T43938
Change-Id: Idcb1576db39cc1d925207a37b4f22b40d76fea8b
georggi [Mon, 4 Jan 2016 09:59:29 +0000 (11:59 +0200)]
Tests: Reflect recent changes to MediaWiki import structure
Bug: T43938
Change-Id: Id8d40d8fa0de59ac07749b3cefdd627b98fe175e
jenkins-bot [Tue, 5 Jan 2016 01:45:24 +0000 (01:45 +0000)]
Merge "Slightly simplify QueryPage::outputResults"
jenkins-bot [Tue, 5 Jan 2016 01:39:28 +0000 (01:39 +0000)]
Merge "Factor page name normalization out of MediaWikiSite"
Marius Hoch [Sun, 20 Dec 2015 21:00:20 +0000 (22:00 +0100)]
Factor page name normalization out of MediaWikiSite
Into a new MediaWikiPageNameNormalizer.
The code has been copied over almost 1:1, I only
left the phpunit test special handling in MediaWiki site.
Change-Id: I008cadd29a2aa1f21098339b895c35a100959b04
Justin Du [Mon, 4 Jan 2016 13:55:15 +0000 (07:55 -0600)]
Split WebRequest.php classes
Change autoload.php file to accomodate the split
Bug: T122633
Change-Id: I0b2260da7cc086659fdd0894f7bb94798dff1163
Translation updater bot [Mon, 4 Jan 2016 21:16:18 +0000 (22:16 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: I2e283dc039c67cb423600c07076c466cf4237a40
ananay [Mon, 4 Jan 2016 18:00:50 +0000 (23:30 +0530)]
Split PHP classes from SpecialConfirmemail.php into separate files
Bug: T122636
Change-Id: Icfdb306e0df8e3571571413d4a340235cd70f1e3
jenkins-bot [Mon, 4 Jan 2016 18:16:14 +0000 (18:16 +0000)]
Merge "Remove deprecated Title::userIsWatching"
Florian [Sun, 3 Jan 2016 14:43:19 +0000 (15:43 +0100)]
Remove deprecated Title::userIsWatching
Bug: T122754
Change-Id: Ibb895855aa1bf6b9cbbaf68643362ea485e0427c
Thiemo Mättig [Mon, 4 Jan 2016 10:34:10 +0000 (11:34 +0100)]
Add missing double colons to Class:static
Change-Id: If31932cddafd9ae0a35cdbc7d337f719acce3ded
jenkins-bot [Mon, 4 Jan 2016 08:47:01 +0000 (08:47 +0000)]
Merge "HTMLForm: Use <button> and allow differing label and value"
jenkins-bot [Mon, 4 Jan 2016 03:33:18 +0000 (03:33 +0000)]
Merge "Update jakub-onderka/php-parallel-lint to 0.9.2"
Justin Du [Sun, 3 Jan 2016 23:10:32 +0000 (17:10 -0600)]
Split SearchResultSet.php classes
Change autoload.php file to accomodate the split
Bug: T122637
Change-Id: I3a326aa329c3be64662825ac06b169ae96b8f53c
jenkins-bot [Sun, 3 Jan 2016 22:21:58 +0000 (22:21 +0000)]
Merge "registration: Allow setting $wgFeedClasses in extension.json"
mhutti1 [Sun, 3 Jan 2016 21:37:17 +0000 (22:37 +0100)]
registration: Allow setting $wgFeedClasses in extension.json
Bug: T122770
Change-Id: I5362ec4c6ea01f4d49d576d5767e9cce4f421046
This, that and the other [Sun, 3 Jan 2016 13:30:24 +0000 (00:30 +1100)]
Import: Try to stop revisions getting created with rev_page = 0
It seems that when two simultaneous imports of the same page are started,
we get into the situation where $pageId is 0 (or at least something that
is transformed to 0 when inserted into the DB).
I can't reproduce this locally, so I can't tell you *why* this is
happening. But what is important is to stop it from happening.
Bug: T18674
Change-Id: I79406a1ef8e5db9a31f029438f8132ef590216fe
Paladox [Sat, 2 Jan 2016 12:16:21 +0000 (12:16 +0000)]
Update jakub-onderka/php-parallel-lint to 0.9.2
https://github.com/JakubOnderka/PHP-Parallel-Lint/releases
Change-Id: I70bb67bb23e1607d1b005971d0cee3851f573d7a
Florian [Sun, 3 Jan 2016 13:21:53 +0000 (14:21 +0100)]
Remove Linker::makeImageLink2
Bug: T122754
Change-Id: Ie28dda59cdc450644f7330135b4d43e036d07bf1
Florian [Sun, 3 Jan 2016 13:00:15 +0000 (14:00 +0100)]
Remove wfMsgNoTrans()
Bug: T70750
Change-Id: Ie8ac70454778b1af7f9dc7026e6dd9749c2abae0
Translation updater bot [Sun, 3 Jan 2016 20:27:28 +0000 (21:27 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: I8321d074ed898ed443d896ce36de6cf937a9a556
Marius Hoch [Sun, 3 Jan 2016 19:31:05 +0000 (20:31 +0100)]
Slightly simplify QueryPage::outputResults
By removing/ deprecating unused things.
Change-Id: Ib9f7439eeeb261a60903eb23f13c65038ebe4945
aude [Sun, 3 Jan 2016 17:57:00 +0000 (09:57 -0800)]
Remove unused, deprecated ChangesList::usePatrol
Deprecated since 1.22 and not used in any extension
hosted in Wikimedia git (and afaik elsewhere).
Change-Id: I0974ba80b7ab21b056d7f16e936b5c564b562e6d
jenkins-bot [Sun, 3 Jan 2016 18:50:13 +0000 (18:50 +0000)]
Merge "Remove not used private member variable mParserWarnings from OutputPage"
jenkins-bot [Sun, 3 Jan 2016 13:21:50 +0000 (13:21 +0000)]
Merge "Import: Handle uploads with sha1 starting with 0 properly"
georggi [Sun, 3 Jan 2016 12:00:35 +0000 (14:00 +0200)]
Import: Handle uploads with sha1 starting with 0 properly
Bug: T65010
Change-Id: Ia3f2d0b02a0f60df88f9466b66f1c7f5dc870c10
jenkins-bot [Sun, 3 Jan 2016 04:05:39 +0000 (04:05 +0000)]
Merge "Fix positioning of jQuery.tipsy tooltip arrows"
Florian [Sun, 3 Jan 2016 00:57:59 +0000 (01:57 +0100)]
Remove not used private member variable mParserWarnings from OutputPage
Change-Id: I2ccc96671a2ae9c10235da19a4341aa6c30f841e
Reedy [Sun, 3 Jan 2016 00:21:35 +0000 (00:21 +0000)]
wfMsgForContentNoTrans() was removed
Bug: T70750
Change-Id: I295b451ecbf765d4c10d90a8373a96b88b8f4115
Reedy [Sat, 2 Jan 2016 22:47:08 +0000 (22:47 +0000)]
Linker::makeLinkObj() was removed
Change-Id: Id0fe255fd65403d02498f5a98292c560d39dd95a
Reedy [Sat, 2 Jan 2016 22:41:37 +0000 (22:41 +0000)]
Linker::makeKnownLinkObj() was removed
Change-Id: I22b8445db8f52ffd6bc4a91d3441be9e5197a8a5
Florian [Sat, 2 Jan 2016 22:31:21 +0000 (23:31 +0100)]
Remove ApiMain::getModules() and ApiQuery::getModules()
No usages anymore in any code hosted on wikimedia git.
Change-Id: I16d1afad211f00b9138219bcf62e5903513169be
jenkins-bot [Sat, 2 Jan 2016 23:17:30 +0000 (23:17 +0000)]
Merge "Remove wfCheckLimits"
jenkins-bot [Sat, 2 Jan 2016 23:13:12 +0000 (23:13 +0000)]
Merge "mediawiki.action.edit.preview: Combine two the consecutive .push"
Florian [Sat, 2 Jan 2016 22:56:38 +0000 (23:56 +0100)]
Remove wfCheckLimits
Change-Id: Iae5614a82681317afd1b96bc9ab1709fa3588539
Reedy [Sat, 2 Jan 2016 21:16:05 +0000 (21:16 +0000)]
LogPage::logName() and logHeader() were removed
Change-Id: Ib8ab894e01b5125207a6f1ac7377c8287b0a8fce
Reedy [Sat, 2 Jan 2016 20:56:43 +0000 (20:56 +0000)]
WikiPage::testPreSaveTransform() was removed
Change-Id: Ibce32556b8213a36876dcb4c6f385afa6e6875aa
Reedy [Sat, 2 Jan 2016 20:47:25 +0000 (20:47 +0000)]
WikiPage::updateRestrictions() was removed
Change-Id: If5bdf84b94fec928387ee12492fbec1f511ca059
jenkins-bot [Sat, 2 Jan 2016 20:42:53 +0000 (20:42 +0000)]
Merge "Removed OutputPage::includeJQuery()"
jenkins-bot [Sat, 2 Jan 2016 20:42:49 +0000 (20:42 +0000)]
Merge "User::getSkin() was removed"
jenkins-bot [Sat, 2 Jan 2016 20:00:30 +0000 (20:00 +0000)]
Merge "Update zordius/lightncandy to v0.23"
Translation updater bot [Sat, 2 Jan 2016 19:42:58 +0000 (20:42 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: I5614864ef5176a595711329006aafe80f8040ff8
Reedy [Sat, 2 Jan 2016 15:17:11 +0000 (15:17 +0000)]
Removed OutputPage::includeJQuery()
All callers use method_exists() to call it
Then include ancient jquery themselves...
Change-Id: I7e270abc7b052156ed1e1793269595a647797526
Reedy [Sat, 2 Jan 2016 02:49:43 +0000 (02:49 +0000)]
User::getSkin() was removed
Change-Id: I7602ab7609b13b807e67296c8ce0a1d184c88521
Reedy [Sat, 19 Dec 2015 00:28:26 +0000 (00:28 +0000)]
Update zordius/lightncandy to v0.23
Depends-On: If8cf6905c5b590ae3bb0297153e966d24ea3bcb8
Change-Id: I1aa2cb76680f4b0c60f3196cc92f0bd18cbcfd33
Reedy [Sat, 2 Jan 2016 18:53:28 +0000 (18:53 +0000)]
OutputPage::blockedPage() was removed
Change-Id: Ie25b69e14155869ff0374a49f1ec3806f026da9d
Florian [Thu, 5 Nov 2015 17:28:54 +0000 (18:28 +0100)]
Convert Special:ConfirmEmail to OOUIHTMLForm
Bug: T117792
Change-Id: I41e752d91598e8e00376e8b2a56629bb40a39ac3
Florian [Thu, 5 Nov 2015 17:54:57 +0000 (18:54 +0100)]
Convert Special:EmailUser to use OOUIHTMLForm
It already used HTMLForm for the main form, but the form, which asked for
the username didn't.
Converted the "Enter username" form to use HTMLForm and show it, if no user-
name was passed to the form, show the main "Send e-mail" form, instead.
Extra points:
- Let HTMLForm::setSubmit*() function return it's own HTMLForm instance
Bug: T117791
Change-Id: I6231577047c93781496e0f8af6809e2ef49e662a
Florian [Mon, 27 Jul 2015 20:37:37 +0000 (22:37 +0200)]
Use OOUI on Special:BlockList
Switch to OOUI HtmlForm and replace mediawiki.userSuggest with
OOUI HtmlForm type user.
Bug: T117734
Change-Id: I37d9acbdd272c0cc2f2e120aada2e9fcea215509
Reedy [Sat, 2 Jan 2016 15:37:15 +0000 (15:37 +0000)]
OutputPage::permissionRequired() was removed
Change-Id: I9ff1d601cf5fc3402f22bdaf829ae2e287652d31
jenkins-bot [Sat, 2 Jan 2016 17:08:50 +0000 (17:08 +0000)]
Merge "wfEmptyMsg() was removed"
Reedy [Sat, 2 Jan 2016 03:05:05 +0000 (03:05 +0000)]
wfEmptyMsg() was removed
Bug: T70750
Change-Id: I8c641f5698da2b1ad18d3285b5705d3fe9a3e655
Reedy [Thu, 31 Dec 2015 00:07:37 +0000 (00:07 +0000)]
Update wfGetDB calls in Maintenance scripts to use getDB()
Change-Id: I9ad6745d84506b736dae94747256caac89715899
jenkins-bot [Sat, 2 Jan 2016 16:36:38 +0000 (16:36 +0000)]
Merge "Convert Special:ExpandTemplates to OOUI"
jenkins-bot [Sat, 2 Jan 2016 16:34:22 +0000 (16:34 +0000)]
Merge "Convert Special:Export to OOUI"
Florian [Sat, 28 Nov 2015 22:57:30 +0000 (23:57 +0100)]
Convert Special:ExpandTemplates to OOUI
Extra points:
* Add error message, when $input was not fiven (previous behaviour was, that
the form was simply displayed again.
Bug: T117748
Change-Id: Ibe4e010fe9d0b2520c2d6964bd66cb2bca3b0bc7
Florian [Wed, 25 Nov 2015 20:20:16 +0000 (21:20 +0100)]
Convert Special:Export to OOUI
Bug: T117753
Change-Id: I974e5b2daefd52cc6c3ba75bc0752492fb86c488
Florian [Wed, 4 Nov 2015 18:14:57 +0000 (19:14 +0100)]
Convert Special:ComparePages to OOUI
Bug: T117752
Change-Id: I480c2165c908ca7c8e08ed5990e386ddb515f3b0
Kunal Mehta [Sat, 2 Jan 2016 07:13:31 +0000 (23:13 -0800)]
registration: Allow setting $wgCentralIdLookupProviders
Follows up
d032bb52cd8c0d.
Change-Id: I43f4fb3d7b2fafc437abcfda73bf865aa8600ba2
Kunal Mehta [Sat, 2 Jan 2016 06:53:20 +0000 (22:53 -0800)]
registration: Handle $wgExtensionCredits inside the ExtensionProcessor
Bug: T108269
Change-Id: I92675dac5cca52448e24902d0a5c865fd6df46d9
jenkins-bot [Sat, 2 Jan 2016 10:21:08 +0000 (10:21 +0000)]
Merge "build: Update mediawiki/mediawiki-codesniffer to 0.5.1"
jenkins-bot [Sat, 2 Jan 2016 10:12:27 +0000 (10:12 +0000)]
Merge "rebuildrecentchanges.php: Document a little bit"
Paladox [Tue, 29 Dec 2015 10:30:42 +0000 (10:30 +0000)]
build: Update mediawiki/mediawiki-codesniffer to 0.5.1
Two rules are ignored for now to allow us to upgrade:
* MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures
* Generic.ControlStructures.InlineControlStructure.NotAllowed
Also ignore the .git folder.
Change-Id: I1b149c72b27be54e22e369999ad0c41c2d1fc2b4
jenkins-bot [Sat, 2 Jan 2016 09:44:06 +0000 (09:44 +0000)]
Merge "Add more cases to MediaWikiTestCaseTest"
jenkins-bot [Sat, 2 Jan 2016 09:16:57 +0000 (09:16 +0000)]
Merge "WikiPage::getUsedTemplates() was removed"
jenkins-bot [Sat, 2 Jan 2016 07:38:47 +0000 (07:38 +0000)]
Merge "Update MessagePoster topic title docs"
Matthew Flaschen [Fri, 1 Jan 2016 03:00:27 +0000 (22:00 -0500)]
Update MessagePoster topic title docs
This limitation was for Flow, which now has slightly expanded support.
As far as I know, there are no MessagePoster implementations other than
wikitext and Flow.
Change-Id: Ia0eaeade693f632aa6b9fb9e9f73c41360d5cadf
Reedy [Sat, 2 Jan 2016 02:56:17 +0000 (02:56 +0000)]
WikiPage::getUsedTemplates() was removed
Change-Id: I5c17a57042025b2f72083a97034a5a2dd6c8cfb5
jenkins-bot [Sat, 2 Jan 2016 00:02:36 +0000 (00:02 +0000)]
Merge "mw.Upload.BookletLayout: Add help text for name and description fields"
jenkins-bot [Sat, 2 Jan 2016 00:02:30 +0000 (00:02 +0000)]
Merge "mw.Upload.BookletLayout: Don't show file extension in the filename input"
Prateek Saxena [Tue, 17 Nov 2015 06:27:21 +0000 (11:57 +0530)]
mw.Upload.BookletLayout: Add help text for name and description fields
Copied the following string from UploadWizard into core to be shown as
help text near the input fields:
* mwe-upwiz-tooltip-title
* mwe-upwiz-tooltip-description
Bug: T116086
Change-Id: Iaaac4908c71b416888921a4e45de66fa87ab448d
Reedy [Sat, 19 Dec 2015 00:59:10 +0000 (00:59 +0000)]
Update nmred/kafka-php to v0.1.5
Change-Id: Iab9a32807c8f9e6a4c72566d3742bf0dc99a7d3e
Depends-On: Ibb9e988b9e81445641c96075a064090d5ed146ca
Translation updater bot [Fri, 1 Jan 2016 18:20:11 +0000 (19:20 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: Ia9ecc303c52bbf66f784b58e23dc5d1633435cf6
jenkins-bot [Fri, 1 Jan 2016 06:00:28 +0000 (06:00 +0000)]
Merge "HTMLForm: Add comment to help grepping function names"
This, that and the other [Fri, 1 Jan 2016 05:53:13 +0000 (16:53 +1100)]
HTMLForm: Add comment to help grepping function names
This confuses me every time I try to figure out HTMLForm's logic flow...
Change-Id: I80ff89caeeaac9af6ff435ecd5c4176615d41d82
Aaron Schulz [Thu, 31 Dec 2015 23:30:16 +0000 (15:30 -0800)]
Make Maintenance::commitTransaction() do slave wait checks
This makes it less likely to be forgotten in scripts.
Change-Id: I9b939dcda8d6191a2a5ee3b3b50d2ec950dc0402
Aaron Schulz [Thu, 31 Dec 2015 00:10:31 +0000 (16:10 -0800)]
Make maintenance scripts use beginTransaction/commitTransaction
Change-Id: I700437a016a40ad82951ae56d215f6dace2bb612
Fomafix [Thu, 31 Dec 2015 21:52:05 +0000 (21:52 +0000)]
mediawiki.action.edit.preview: Combine two the consecutive .push
Also add a comment to explain the whitespace.
Change-Id: Ia4a20074f5e8a5c897b121111aea4aa5bebab3ad
Andrew H [Thu, 31 Dec 2015 02:11:21 +0000 (02:11 +0000)]
Add 7zip compression level param to BackupDumper
Adds a --7ziplevel param to dumpBackup.php and dumpTextPass.php,
used when an --output of type '7zip' is specified.
Bug: T78669
Change-Id: I9ee8169daf30b4d8251c7a344b593c29c81eb799
jenkins-bot [Thu, 31 Dec 2015 18:15:54 +0000 (18:15 +0000)]
Merge "registration: Prevent loading the same thing twice"
This, that and the other [Thu, 31 Dec 2015 09:46:54 +0000 (20:46 +1100)]
Refactor dumpBackup.php and dumpTextPass.php to be Maintenance subclasses
Use the Maintenance class's new $orderedOptions and support for
passing options multiple times. This allows for option "chaining".
The BackupDumper and TextPassDumper class now extend Maintenance, but
should continue to function as before. The public function processArgs()
has been removed and replaced by processOptions(), which takes no
parameters. It is unlikely that users of these classes were calling
processArgs.
Inheritors of these classes that overrode processOption() will now need to
override processOptions() and use Maintenance::getOption() and friends.
The maintenance/backupTextPass.inc file has been deleted. Users should
include maintenance/dumpTextPass.php instead.
Bug: T122587
Change-Id: I2473ee119c185d1b2b00ac4b1e70ee8a6cafe4a3
Kevin Israel [Mon, 28 Sep 2015 23:15:49 +0000 (19:15 -0400)]
dumpBackup.php: Remove --force-normal option
The code handling this option, added in r14151 /
64cbfd80b576, used to call
dl() to allow use of the utfnormal library's custom PHP extension even if
it is not enabled in php.ini. That part was removed in 1.22 (
d0c8ba037cf6).
And as pointed out by Ariel Glenn[1], the utfnormal library later dropped
support for that PHP extension in
6c61fd7c7843 (in favor of intl, which had
already been supported since 1.17 (r69626 /
f08147c313f5)), so there is now
no reason whatsoever to check for utf8_normalize(). The option will now be
treated like any other unrecognized option and will be silently ignored.
[1]: https://phabricator.wikimedia.org/T94277#
1680209
Change-Id: I467bf609fda6e923fd2d654400d8e1b6c3714d96
jenkins-bot [Thu, 31 Dec 2015 01:36:37 +0000 (01:36 +0000)]
Merge "Add loadWithArgv() to Maintenance class"
Andrew H [Wed, 30 Dec 2015 20:43:10 +0000 (20:43 +0000)]
Add loadWithArgv() to Maintenance class
Very useful for passing in arguments to test Maintenance scripts.
Also, add a comment clarifying when $orderedOptions is available.
Change-Id: Ib25b3b36816bdf566c427b67646554a31a9fef0f
jenkins-bot [Thu, 31 Dec 2015 01:18:46 +0000 (01:18 +0000)]
Merge "Fix some FSFileBackend IDEA errors"
jenkins-bot [Thu, 31 Dec 2015 01:14:54 +0000 (01:14 +0000)]
Merge "Fix corrupt ©"
jenkins-bot [Thu, 31 Dec 2015 01:11:13 +0000 (01:11 +0000)]
Merge "Fix some FileOpBatch IDEA errors"
Reedy [Thu, 31 Dec 2015 01:01:23 +0000 (01:01 +0000)]
Fix corrupt ©
Change-Id: I2a875cf770e19834fdd22d57691ed945e524d7d7
Aaron Schulz [Thu, 31 Dec 2015 00:21:46 +0000 (16:21 -0800)]
Fix numerious errors in RecompressTracked
* Fix method calls to wrong classes
* Cleanup IDEA errors in static analysis
Change-Id: Ibd0fdb52db884abefb149f5340a4a4b5dad2c89b