r93686 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r93685‎ | r93686 | r93687 >
Date:23:34, 1 August 2011
Author:demon
Status:ok (Comments)
Tags:
Comment:
Merge live hacks - Tim's fixes for "canary mismatches" from back around the 1.17 deploy. Don't want to push this to trunk, but don't want it lost easier :)
Modified paths:
  • /branches/wmf/1.17wmf1/includes/DefaultSettings.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/includes/DefaultSettings.php
——@@ -172,7 +172,8 @@
173173 * The URL path of the skins directory. Defaults to "{$wgScriptPath}/skins"
174174 */
175175 $wgStylePath = false;
176 -$wgStyleSheetPath = &$wgStylePath;
 176+# Broken PHP, canary mismatch -- TS
 177+#$wgStyleSheetPath = &$wgStylePath;
177178
178179 /**
179180 * The URL path of the skins directory. Should not point to an external domain.
——@@ -3458,10 +3459,11 @@
34593460 * user who has provided an e-mail address.
34603461 */
34613462 $wgAutopromote = array(
 3463+ /* test patch -- TS
34623464 'autoconfirmed' => array( '&',
34633465 array( APCOND_EDITCOUNT, &$wgAutoConfirmCount ),
34643466 array( APCOND_AGE, &$wgAutoConfirmAge ),
3465 - ),
 3467+ ),*/
34663468 );
34673469
34683470 /**

Follow-up revisions

RevisionCommit summaryAuthorDate
r975051.18wmf1 Merge r83867, r93686, r93807, r93971, r93972 (some manually do to lo...reedy15:31, 19 September 2011

Comments

#Comment by 😂 (talk | contribs)   23:36, 1 August 2011

s/easier/either/

#Comment by Aaron Schulz (talk | contribs)   20:02, 19 September 2011

Why is the 'autoconfirmed' change needed?

#Comment by 😂 (talk | contribs)   20:05, 19 September 2011

I would have to dig my IRC logs, but it was related to the issue at hand.

#Comment by G.Hagedorn (talk | contribs)   18:34, 20 September 2011

Why is this needed on WMF but not mediawiki 1.18 or trunk?

#Comment by Reedy (talk | contribs)   18:40, 20 September 2011

This is one of a few various "live hacks". Per the above, we don't have the reason why it's needed, so it'd be naive just to apply it to non WMF branches straight off

Status & tagging log