jenkins-bot [Wed, 10 Jan 2018 18:12:05 +0000 (18:12 +0000)]
Merge "Numbers in the parser profiling data are not internationalized"
jenkins-bot [Wed, 10 Jan 2018 17:14:54 +0000 (17:14 +0000)]
Merge "Revert "Revert "[MCR] Add and use $title param to RevisionStoregetPrevious/Next"""
addshore [Wed, 10 Jan 2018 12:23:06 +0000 (12:23 +0000)]
Revert "Revert "[MCR] Add and use $title param to RevisionStoregetPrevious/Next""
This is a partial revert of a revert that reverted a fix believed to
have had its underlying issue fixed in:
https://gerrit.wikimedia.org/r/#/c/400577/
The compat layer (Revision), now passes a Title object into the
RevisionStore, and this title is used to construct the Record and
also any new Revision objects.
Bug: T184559
Bug: T183548
Change-Id: Id073265c173f60aa8c456550fdb4bb5196013be8
jenkins-bot [Wed, 10 Jan 2018 14:04:58 +0000 (14:04 +0000)]
Merge "RCFilters: Only normalize title with 'target' when it is needed"
jenkins-bot [Wed, 10 Jan 2018 13:25:59 +0000 (13:25 +0000)]
Merge "Integration tests for FirejailCommand"
jenkins-bot [Wed, 10 Jan 2018 13:20:22 +0000 (13:20 +0000)]
Merge "API: Don't apply size limit to action=compare"
jenkins-bot [Wed, 10 Jan 2018 13:10:19 +0000 (13:10 +0000)]
Merge "ApiQueryImageInfo: Don't return URLs if the archived file is missing"
jenkins-bot [Wed, 10 Jan 2018 13:09:33 +0000 (13:09 +0000)]
Merge "Use Sanitizer::mergeAttributes when merging classes into attributes"
jenkins-bot [Wed, 10 Jan 2018 12:44:23 +0000 (12:44 +0000)]
Merge "RCFilters: uriprocessor test: use hardcoded uri"
jenkins-bot [Wed, 10 Jan 2018 12:39:30 +0000 (12:39 +0000)]
Merge "Update OOUI to v0.25.0"
jenkins-bot [Wed, 10 Jan 2018 12:37:30 +0000 (12:37 +0000)]
Merge "Bump min supported HHVM version to 3.18.5"
Volker E [Wed, 10 Jan 2018 01:04:08 +0000 (17:04 -0800)]
Update OOUI to v0.25.0
Release notes:
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.25.0
Depends-On: I5f574a0d2702f421c0c9d2556e3162abd55b9f23
Change-Id: I8a5b279f6dcb9b620e3e4e8998fc2b2d678573db
Reedy [Sat, 30 Dec 2017 02:58:03 +0000 (02:58 +0000)]
Bump min supported HHVM version to 3.18.5
Change-Id: I0a22c638bf6bbd6c8b93e50c23f8e455e36acd7c
jenkins-bot [Wed, 10 Jan 2018 06:16:53 +0000 (06:16 +0000)]
Merge "EditPage: Remove separator between cancel and help"
jenkins-bot [Wed, 10 Jan 2018 06:04:37 +0000 (06:04 +0000)]
Merge "Added tests for ComposerInstalled"
Albert221 [Mon, 8 Jan 2018 22:18:05 +0000 (23:18 +0100)]
EditPage: Remove separator between cancel and help
It is no longer needed because those buttons
are already splitted visually by blank space.
Bug: T183672
Change-Id: I1f8a8413a5f4da441e3f4b4ef0b1e03d174987ca
ryan10145 [Tue, 9 Jan 2018 01:11:48 +0000 (20:11 -0500)]
Added tests for ComposerInstalled
Bug: T183899
Change-Id: Id822caad044a079884795dbea37baf10514bcf5c
jenkins-bot [Wed, 10 Jan 2018 00:10:51 +0000 (00:10 +0000)]
Merge "Migrate ar_text to modern storage"
jenkins-bot [Tue, 9 Jan 2018 22:40:25 +0000 (22:40 +0000)]
Merge "[BREAKING CHANGE] Rename TitleWidget#getTitle to TitleWidget#getMWTitle"
Brad Jorsch [Tue, 28 Nov 2017 21:13:09 +0000 (16:13 -0500)]
Migrate ar_text to modern storage
This really should have been done a very long time ago.
This adds a maintenance script to migrate rows with ar_text_id null to
modern storage, either the text table or ExternalStore.
Bug: T36925
Change-Id: I5608c6b6d3ecad516b785e13d668427c1b762e41
Translation updater bot [Tue, 9 Jan 2018 21:00:13 +0000 (22:00 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: I558e8cc84fb0d24d2eb1d4491a5cf9044cd10379
jenkins-bot [Tue, 9 Jan 2018 19:15:47 +0000 (19:15 +0000)]
Merge "Remove obsolete style-only module 'mediawiki.action.history.diff'"
jenkins-bot [Tue, 9 Jan 2018 17:44:56 +0000 (17:44 +0000)]
Merge "CSSMin: Re-introduce whitespace mangling in embedded SVGs"
Volker E [Tue, 9 Jan 2018 02:34:22 +0000 (18:34 -0800)]
CSSMin: Re-introduce whitespace mangling in embedded SVGs
Convert newlines and tabs to spaces (which can be unencoded),
and consolidate runs of multiple spaces into a single space.
Also remove any leading and trailing spaces that might result
(most files end in a newline, for example).
Follow-up to Iddc98332d. This was reverted as dependency for the
original issues causing patch, but works perfectly fine.
Bug: T175318
Change-Id: Ic25d73caeb42ba7a32ef304806d401047b5a1997
jenkins-bot [Tue, 9 Jan 2018 16:38:04 +0000 (16:38 +0000)]
Merge "Fix type hint in ApiErrorFormatter::addMessagesFromStatus"
Brad Jorsch [Tue, 9 Jan 2018 15:19:39 +0000 (10:19 -0500)]
ApiQueryImageInfo: Don't return URLs if the archived file is missing
If the archived file doesn't exist, indicate that instead of returning
bogus URLs.
Bug: T184445
Change-Id: I831b13314300f0289a2baf26ed21d81be31b292a
Stephane Bisson [Tue, 9 Jan 2018 15:15:06 +0000 (10:15 -0500)]
RCFilters: uriprocessor test: use hardcoded uri
new mw.Uri() without arguments uses the current browser
uri. It caused some tests to fail when run from a uri with
a subpage (Special:JavaScriptTest/qunit) and it's generally
bad to have unit tests use uncontrolled environment data.
Change-Id: Id434a491aadc2d84165edf4fd1c59775c9b815ad
jenkins-bot [Tue, 9 Jan 2018 14:52:14 +0000 (14:52 +0000)]
Merge "Move BaseDump into includes/export/"
jenkins-bot [Tue, 9 Jan 2018 13:50:31 +0000 (13:50 +0000)]
Merge "Add switch for readonly watchlists"
jenkins-bot [Tue, 9 Jan 2018 13:19:33 +0000 (13:19 +0000)]
Merge "Update outdated WikiPageDeletionUpdates documentation"
Thiemo Mättig [Tue, 9 Jan 2018 13:01:17 +0000 (14:01 +0100)]
Fix type hint in ApiErrorFormatter::addMessagesFromStatus
Change-Id: Ia7b628e9f6a7f8c8d803732504621c13976bf618
Thiemo Mättig [Tue, 9 Jan 2018 12:55:37 +0000 (13:55 +0100)]
Use IDatabase interface instead of Database in DBAccessBase
There is one subclass I'm aware of that overwrites the releaseConnection
method. It's in the EducationProgram extension and already updated, see
Ibb067ca.
Change-Id: I68504f9cd32aa0d0c6c068dbaa1f2ee65649afa4
Thiemo Mättig [Tue, 9 Jan 2018 12:15:04 +0000 (13:15 +0100)]
Update outdated WikiPageDeletionUpdates documentation
This was already updated on
https://www.mediawiki.org/wiki/Manual:Hooks/WikiPageDeletionUpdates
more than a year ago, just missed here.
This patch is a direct follow up for a request in I3a42ec1.
Change-Id: I595b78da214c736d8e73d6d8c7af34a1613dd076
Chad Horohoe [Mon, 8 Jan 2018 21:10:35 +0000 (13:10 -0800)]
Move BaseDump into includes/export/
There's no reason for this to have to live in Maintenance land. It's
generally useful and lets us avoid some random require/include calls
Change-Id: I60419c7f9fc52313905053bbeb3aa81666c9160c
James D. Forrester [Tue, 9 Jan 2018 00:05:05 +0000 (16:05 -0800)]
Follow-up
8a7fb8577: For deprecated RL modules, allow strings
So that more than just PHP code and MediaWiki core can use it, but
also JSON-based static extension registrations. :-)
Change-Id: If22fccbb43c5b05db2a666d61ae8864ee9815e7d
jenkins-bot [Mon, 8 Jan 2018 23:03:41 +0000 (23:03 +0000)]
Merge "Treat phpdbg as run from the command line when checking PHP_SAPI"
jenkins-bot [Mon, 8 Jan 2018 22:42:08 +0000 (22:42 +0000)]
Merge "RCFilters: Fix limit display for limit=1"
Translation updater bot [Mon, 8 Jan 2018 21:04:47 +0000 (22:04 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: I9c3cdd99a86aa1a442591406baceeac8edb977ab
jenkins-bot [Mon, 8 Jan 2018 19:24:22 +0000 (19:24 +0000)]
Merge "Add text to tab links telling if they do exist"
Matthias Mullie [Mon, 8 Jan 2018 12:36:20 +0000 (13:36 +0100)]
Pass along interface language to license preview
Bug: T184422
Change-Id: Ib1a99271ddc32f3ede0360716422e2de9fdfb005
Albert221 [Wed, 3 Jan 2018 14:33:58 +0000 (15:33 +0100)]
Add text to tab links telling if they do exist
And changed a little bit signature of Linker::titleAttrib
and Linker::tooltipAndAcceskeyAttribs. Added $options
parameter to the second one and made $options parameter
satisfied by passing an array with options, because there
is one more now: 'nonexisting' which tells to add text
about the thing that the page does not exist to its tooltip.
Bug: T19099
Change-Id: Ia76dd6db363f6add5efb8955be9e23a1f8e8476f
Brad Jorsch [Mon, 8 Jan 2018 14:21:23 +0000 (09:21 -0500)]
API: Don't apply size limit to action=compare
Some diffs can be really huge. Since ApiComparePages is intended to
return only the diff and some small metadata, bypass $wgAPIMaxResultSize
to allow the diff to be returned even if it's insanely huge.
Really insanely huge diffs might still make PHP run out of memory, even
before it gets the chance to return the diff to the API. That is outside
the scope of this change.
Bug: T184412
Change-Id: I755417f573c3caf85031d03b262aa55bd8cf36d7
jenkins-bot [Mon, 8 Jan 2018 13:29:03 +0000 (13:29 +0000)]
Merge "Fix BlobStoreFactoryTest @covers tag"
jenkins-bot [Mon, 8 Jan 2018 13:01:11 +0000 (13:01 +0000)]
Merge "[MCR] Improve documentation and method naming on Revision and RevisionStore."
daniel [Wed, 27 Dec 2017 15:46:03 +0000 (16:46 +0100)]
[MCR] Improve documentation and method naming on Revision and RevisionStore.
Change-Id: I3b049acff9313814a4ac448289d1aef88cb7f9df
addshore [Fri, 5 Jan 2018 15:44:36 +0000 (15:44 +0000)]
Assert order of MediaWikiTestCaseSchema*Test execution
Make sure that we fail if these tests are run in the wrong order.
Essentially testing an assumption that currently holds true, but
could change in the future.
Change-Id: I8f33281d18f6f64e0e06c1b371b973542244dd24
addshore [Mon, 8 Jan 2018 12:03:35 +0000 (12:03 +0000)]
Fix BlobStoreFactoryTest @covers tag
Change-Id: I6d61d128de3fc63d88c7767f90350f3edbfc447c
jenkins-bot [Mon, 8 Jan 2018 05:42:24 +0000 (05:42 +0000)]
Merge "Add Help Page link in Special:ExpandTemplates"
jenkins-bot [Mon, 8 Jan 2018 05:41:17 +0000 (05:41 +0000)]
Merge "Add Help Page link in Special:ApiSandbox"
Jayprakash12345 [Sun, 7 Jan 2018 08:35:12 +0000 (08:35 +0000)]
Add Help Page link in Special:ApiSandbox
Bug: T184365
Change-Id: I61ca80947c331bbdbe59feff5f33942a7d800a51
jenkins-bot [Sun, 7 Jan 2018 23:26:55 +0000 (23:26 +0000)]
Merge "Added Tests for ContentModelLogFormatter"
ryan10145 [Sun, 7 Jan 2018 22:54:34 +0000 (17:54 -0500)]
Added Tests for ContentModelLogFormatter
Bug: T183900
Change-Id: I812b477eb45e19a06e5c18bc30da731f4af8cc8f
Translation updater bot [Sun, 7 Jan 2018 21:22:49 +0000 (22:22 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: Ia3c463c01f95b7dc3257cf878ae0f9560bbbd684
jenkins-bot [Sun, 7 Jan 2018 19:35:32 +0000 (19:35 +0000)]
Merge "Improve some parameter docs"
Huji Lee [Tue, 2 Jan 2018 00:48:27 +0000 (19:48 -0500)]
Numbers in the parser profiling data are not internationalized
Bug: T158607
Change-Id: I7c2939e3171e320dce6a11d1c3ba0caf36c81d8f
jenkins-bot [Sun, 7 Jan 2018 13:01:04 +0000 (13:01 +0000)]
Merge "Add ul { margin-top: 0; margin-bottom: 0 } for multi-column"
Umherirrender [Sun, 7 Jan 2018 10:38:43 +0000 (11:38 +0100)]
Improve some parameter docs
Change-Id: I31e983d7ac287158101b18ad95779d83537302a2
Jayprakash12345 [Sun, 7 Jan 2018 08:54:09 +0000 (08:54 +0000)]
Add Help Page link in Special:ExpandTemplates
Bug: T184366
Change-Id: Ice286405ec821c983020ebd6795ae429485c6d3c
Gergő Tisza [Fri, 22 Dec 2017 01:20:45 +0000 (01:20 +0000)]
Integration tests for FirejailCommand
Change-Id: I8bb5f8ad528da55c4432928ffb124f9ac0c32518
jenkins-bot [Sat, 6 Jan 2018 21:28:22 +0000 (21:28 +0000)]
Merge "Add options and join conds to MediaWikiTestCase::assertSelect"
daniel [Sat, 6 Jan 2018 10:16:13 +0000 (11:16 +0100)]
Fix dropping of temp tables on SQLite and PG.
Also addresses other compatibility issues with PG mentioned
in comments on I7a4071072.
Bug: T184333
Change-Id: I478aa1aee15fdef99630c65a37b1af5f3f8cce14
Fomafix [Fri, 8 Dec 2017 10:48:40 +0000 (11:48 +0100)]
Add ul { margin-top: 0; margin-bottom: 0 } for multi-column
The multi-column layout of a list has a currently different top margin
on the first column and on the following columns. On skin Timeless this
is conspicuous because there is a bigger top margin for lists.
This change fixes this for all skins.
This is a follow-up to
cd95215caee7ead1098e5fa599d83da9bf56385f.
Change-Id: Icce12f52f98482e80aabd36af1359e37e2038705
Translation updater bot [Sat, 6 Jan 2018 07:44:59 +0000 (08:44 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: I5b6da18066002cd7e995f55595feca586a21dc1a
jenkins-bot [Fri, 5 Jan 2018 23:57:59 +0000 (23:57 +0000)]
Merge "Add semantic tags to license info text"
Stephane Bisson [Thu, 4 Jan 2018 20:49:15 +0000 (15:49 -0500)]
[BREAKING CHANGE] Rename TitleWidget#getTitle to TitleWidget#getMWTitle
Rename TitleWidget#getTitle so it won't clash with TitledElement#getTitle
Bug: T184181
Change-Id: I97ff46d8ca60f260af2a0b12e6c053aa91c777d1
Mark A. Hershberger [Fri, 5 Jan 2018 00:55:40 +0000 (19:55 -0500)]
Make FormatMetadata::flattenArrayReal() work for an associative array
Bug: T87572
Change-Id: I19490ebbbdc3613ae2116c6890ca470bb9f332db
jenkins-bot [Fri, 5 Jan 2018 17:18:46 +0000 (17:18 +0000)]
Merge "RCLFilters: reword target placeholder"
jenkins-bot [Fri, 5 Jan 2018 16:43:30 +0000 (16:43 +0000)]
Merge "Introduce DB schema overrides for unit tests."
jenkins-bot [Fri, 5 Jan 2018 16:42:44 +0000 (16:42 +0000)]
Merge "Set a default delimiter in Database::sourceStream"
Brad Jorsch [Fri, 5 Jan 2018 16:26:56 +0000 (11:26 -0500)]
Add options and join conds to MediaWikiTestCase::assertSelect
Because selects sometimes need to specify these.
Change-Id: I853e8210bbafe16a62060b9075384afb9cdb03c0
daniel [Thu, 16 Nov 2017 16:48:25 +0000 (17:48 +0100)]
Introduce DB schema overrides for unit tests.
This introduces MediaWikiTestCase::getSchemaOverrides, which can be overwritten
to return information about which tables are going to be altered, and which SQL
files should be used to set up the target schema. This allows tests for a class
that interacts with the database can have a subclass for each supported database
schema.
NOTE: this has only been tested with MySQL.
Bug: T180705
Change-Id: I7a4071072d802a82ecf7d16fbf8882ff8c79287f
addshore [Fri, 5 Jan 2018 15:37:30 +0000 (15:37 +0000)]
Set a default delimiter in Database::sourceStream
Discovered while debugging I7a4071072d802a82ecf7d16fbf8882ff8c79287f
DatabaseIntegration test alters the delimiter for the database instance
and it never gets set back.
Simply set the delimiter back to a default value at the start of
sourceSteam (for each new file pointer) which could have a new
delimiter.
Change-Id: Ib829b1c8d87271526fa6826910d40c304c778b32
jenkins-bot [Fri, 5 Jan 2018 12:45:35 +0000 (12:45 +0000)]
Merge "Remove duplicate names from CREDITS"
Stephane Bisson [Fri, 5 Jan 2018 11:29:18 +0000 (06:29 -0500)]
RCLFilters: reword target placeholder
Bug: T172161
Change-Id: I8af648794cf7972efdbb1543665295d8f1368a4b
jenkins-bot [Fri, 5 Jan 2018 10:24:19 +0000 (10:24 +0000)]
Merge "[MCR] Tests for WikiPage::doUpdateRestrictions"
WMDE-Fisch [Fri, 5 Jan 2018 09:32:56 +0000 (10:32 +0100)]
Use Sanitizer::mergeAttributes when merging classes into attributes
Change-Id: Ia5199a75e6926fe64b3d99d5b5914320491176bb
L10n-bot [Fri, 5 Jan 2018 07:35:08 +0000 (07:35 +0000)]
Merge "Localisation updates from https://translatewiki.net."
L10n-bot [Fri, 5 Jan 2018 07:34:59 +0000 (07:34 +0000)]
Merge "Localisation updates from https://translatewiki.net."
Matthew Flaschen [Fri, 5 Jan 2018 05:51:24 +0000 (00:51 -0500)]
RCFilters: Fix limit display for limit=1
Fix typo so it's '1 change' instead of 'change'.
Bug: T182241
Change-Id: I5026207ddbd421cd521252ac7842b54a9e687953
Kunal Mehta [Thu, 4 Jan 2018 08:18:30 +0000 (00:18 -0800)]
Update nikic/php-parser to 3.1.3
And fix the only incompatibility in findDeprecated.php. It's OK to throw
exceptions on invalid files since we lint all PHP files so there
should be no invalid ones.
Change-Id: Ie5913c2aae4b521a4b6f805e911e4e2764386b45
jenkins-bot [Fri, 5 Jan 2018 00:53:45 +0000 (00:53 +0000)]
Merge "Added Tests for ListToggle"
jenkins-bot [Thu, 4 Jan 2018 23:49:41 +0000 (23:49 +0000)]
Merge "rdbms: Remove unused setServerInfo/getServerInfo methods from LoadBalancer"
Aaron Schulz [Thu, 4 Jan 2018 18:28:31 +0000 (10:28 -0800)]
rdbms: Remove unused setServerInfo/getServerInfo methods from LoadBalancer
Change-Id: Iffb99c96ca77957a81f1cb8d1e6ae5b1c198e3f5
jenkins-bot [Thu, 4 Jan 2018 23:35:55 +0000 (23:35 +0000)]
Merge "Fix Maintenance::output when called very early"
Marius Hoch [Thu, 4 Jan 2018 23:19:55 +0000 (00:19 +0100)]
Fix Maintenance::output when called very early
If a maintenance script is called with --help (or without
required args), this is currently failing, as MediaWikiServices
is only loaded after Maintenance::setup is initially called.
Follows
336454104d1249439e3ff97746de69c5e7b4a5f9.
Change-Id: Ied283d362675b6b98bd3144132a240b432998991
ryan10145 [Thu, 4 Jan 2018 02:41:02 +0000 (21:41 -0500)]
Added Tests for ListToggle
Bug: T183898
Change-Id: I1c6cd8ea21127db56701cc6073fa880b2180d846
Umherirrender [Thu, 4 Jan 2018 22:18:55 +0000 (23:18 +0100)]
Use namespaced version of IDatabase
Change-Id: I49c9b462d316763f90ebf5a95caa388716d6a278
jenkins-bot [Thu, 4 Jan 2018 21:56:45 +0000 (21:56 +0000)]
Merge "Moved textbox1 building into TextConflictHelper on edit conflicts"
Roan Kattouw [Thu, 4 Jan 2018 20:27:11 +0000 (21:27 +0100)]
Follow-up
6f07389ef2eb: fix variable name
Caused Notice: Undefined variable: text
Bug: T184123
Change-Id: I950a02134b145a2928af33995ca37a6965f265e4
jenkins-bot [Thu, 4 Jan 2018 21:31:20 +0000 (21:31 +0000)]
Merge "Cleanup live update feature flag and FilterWrapperWidget"
jenkins-bot [Thu, 4 Jan 2018 21:14:12 +0000 (21:14 +0000)]
Merge "Remove deprecated back-compat HtmlFormatter class"
jenkins-bot [Thu, 4 Jan 2018 21:05:29 +0000 (21:05 +0000)]
Merge "Add tests for ApiFormatRaw"
jenkins-bot [Thu, 4 Jan 2018 21:01:12 +0000 (21:01 +0000)]
Merge "Add tests for ApiFormatBase"
jenkins-bot [Thu, 4 Jan 2018 19:45:52 +0000 (19:45 +0000)]
Merge "Add some @noinspection flags to doPostOutputShutdown()"
WMDE-Fisch [Wed, 6 Dec 2017 14:25:39 +0000 (15:25 +0100)]
Moved textbox1 building into TextConflictHelper on edit conflicts
Factored out some minor parts about building editor CSS classes.
getEditConflictMainTextBox() mainly mirrors showTextbox1 parts not
included were moved to the EditPage.
Change-Id: I671e095acc08382dd0a1c3d167fdaaa623ec5499
Phantom42 [Mon, 1 Jan 2018 19:36:09 +0000 (21:36 +0200)]
Add tests for ApiFormatRaw
Bug: T183767
Change-Id: I63ce42dd61f6e47f7278c436cad1e4f05e287b04
jenkins-bot [Thu, 4 Jan 2018 17:27:45 +0000 (17:27 +0000)]
Merge "[MCR] fix RevisionStore::checkDatabaseWikiId for DB names with dashes."
addshore [Wed, 3 Jan 2018 14:42:13 +0000 (14:42 +0000)]
[MCR] fix RevisionStore::checkDatabaseWikiId for DB names with dashes.
This is a quick hack, for a proper solution see I6a98684af1d7
Bug: T183914
Change-Id: I45a151a332145438c484e02bbe96cd85dd602b9e
addshore [Mon, 20 Mar 2017 13:18:22 +0000 (13:18 +0000)]
Add switch for readonly watchlists
Bug: T160062
Change-Id: I70d28df48f86e8cae4e454cf3f9097c65dc1d92b
addshore [Mon, 4 Dec 2017 18:23:17 +0000 (19:23 +0100)]
[MCR] Tests for WikiPage::doUpdateRestrictions
Bug: T180989
Change-Id: I75518d5ba34119e88e3e382523583fa8b65bc730