http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64150
Revision: 64150
Author: tstarling
Date: 2010-03-25 06:29:20 +0000 (Thu, 25 Mar 2010)
Log Message:
-----------
Applied local patches for new WMF branch
Modified Paths:
--------------
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Highlight/Highlight.js
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
branches/wmf/1.16wmf4/includes/DefaultSettings.php
branches/wmf/1.16wmf4/languages/LanguageConverter.php
Property Changed:
----------------
branches/wmf/1.16wmf4/
branches/wmf/1.16wmf4/StartProfiler.php
branches/wmf/1.16wmf4/extensions/CentralAuth/
branches/wmf/1.16wmf4/extensions/Collection/
branches/wmf/1.16wmf4/extensions/ConditionalShowSection/
branches/wmf/1.16wmf4/extensions/ContactPageFundraiser/
branches/wmf/1.16wmf4/extensions/ExtensionDistributor/
branches/wmf/1.16wmf4/extensions/FlaggedRevs/
branches/wmf/1.16wmf4/extensions/FundraiserPortal/
branches/wmf/1.16wmf4/extensions/HoneypotIntegration/HoneypotIntegration.class.php
branches/wmf/1.16wmf4/extensions/LiquidThreads/
branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/
branches/wmf/1.16wmf4/extensions/LocalisationUpdate/
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/ballots/Ballot.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/crypt/Crypt.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/crypt/Random.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Election.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Entity.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Option.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Question.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/main/Base.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/main/Context.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/main/Store.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/DetailsPage.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/DumpPage.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/EntryPage.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/ListPage.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/LoginPage.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/MessageDumpPage.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/Page.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/TallyPage.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/TranslatePage.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/VotePage.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/talliers/ElectionTallier.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/talliers/Tallier.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/user/Auth.php
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/user/Voter.php
branches/wmf/1.16wmf4/extensions/StringFunctionsEscaped/
branches/wmf/1.16wmf4/extensions/TrustedXFF/
branches/wmf/1.16wmf4/extensions/TrustedXFF/trusted-hosts.txt
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js
branches/wmf/1.16wmf4/includes/
branches/wmf/1.16wmf4/includes/ChangesList.php
branches/wmf/1.16wmf4/includes/ConfEditor.php
branches/wmf/1.16wmf4/includes/HistoryPage.php
branches/wmf/1.16wmf4/includes/LocalisationCache.php
branches/wmf/1.16wmf4/includes/OutputPage.php
branches/wmf/1.16wmf4/includes/api/
branches/wmf/1.16wmf4/includes/json/Services_JSON.php
branches/wmf/1.16wmf4/includes/specials/
branches/wmf/1.16wmf4/maintenance/cleanupTable.inc
branches/wmf/1.16wmf4/maintenance/deleteSelfExternals.php
branches/wmf/1.16wmf4/maintenance/jobs-loop.sh
branches/wmf/1.16wmf4/maintenance/moveBatch.php
branches/wmf/1.16wmf4/maintenance/storage/recompressTracked.sh
branches/wmf/1.16wmf4/maintenance/storage/testRctComplete.php
branches/wmf/1.16wmf4/math/GNUmakefile
branches/wmf/1.16wmf4/skins/common/jquery.js
branches/wmf/1.16wmf4/skins/common/jquery.min.js
Property changes on: branches/wmf/1.16wmf4
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3:63545-63546,63549,63643,63764,63897-63901
+ /branches/wmf-deployment:60970,62002
/trunk/phase3:63545-63546,63549,63643,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/StartProfiler.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/StartProfiler.php:51646
/trunk/phase3/StartProfiler.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,57154-57447,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/StartProfiler.php:51646
/branches/wmf-deployment/StartProfiler.php:60970,62002
/trunk/phase3/StartProfiler.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,57154-57447,57541,57916,58151,58219,58633,58816
Property changes on: branches/wmf/1.16wmf4/extensions/CentralAuth
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/CentralAuth:62827
+ /branches/wmf-deployment/extensions/CentralAuth:60970,62002
/trunk/extensions/CentralAuth:62827
Property changes on: branches/wmf/1.16wmf4/extensions/Collection
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/Collection:62820-64113
+ /branches/wmf-deployment/extensions/Collection:60970,62002
/trunk/extensions/Collection:62820-64113
Property changes on: branches/wmf/1.16wmf4/extensions/ConditionalShowSection
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/ConditionalShowSection:51646
+ /branches/REL1_15/phase3/extensions/ConditionalShowSection:51646
/branches/wmf-deployment/extensions/ConditionalShowSection:60970,62002
Property changes on: branches/wmf/1.16wmf4/extensions/ContactPageFundraiser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/ContactPageFundraiser:51646
/trunk/extensions/ContactPageFundraiser:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/trunk/phase3/ContactPageFundraiser:52859,53272
/trunk/phase3/extensions/ContactPageFundraiser:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626
+ /branches/REL1_15/phase3/extensions/ContactPageFundraiser:51646
/branches/wmf-deployment/extensions/ContactPageFundraiser:60970,62002
/trunk/extensions/ContactPageFundraiser:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/trunk/phase3/ContactPageFundraiser:52859,53272
/trunk/phase3/extensions/ContactPageFundraiser:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626
Property changes on: branches/wmf/1.16wmf4/extensions/ExtensionDistributor
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/ExtensionDistributor:63902
+ /branches/wmf-deployment/extensions/ExtensionDistributor:60970,62002
/trunk/extensions/ExtensionDistributor:63902
Property changes on: branches/wmf/1.16wmf4/extensions/FlaggedRevs
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/FlaggedRevs:51646
/trunk/extensions/FlaggedRevs:56151-57450,57735-57736
/trunk/phase3/extensions/FlaggedRevs:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/extensions/FlaggedRevs:51646
/branches/wmf-deployment/extensions/FlaggedRevs:60970,62002
/trunk/extensions/FlaggedRevs:56151-57450,57735-57736
/trunk/phase3/extensions/FlaggedRevs:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
Property changes on: branches/wmf/1.16wmf4/extensions/FundraiserPortal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/FundraiserPortal-multi:55038-55211
+ /branches/FundraiserPortal-multi:55038-55211
/branches/wmf-deployment/extensions/FundraiserPortal:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/HoneypotIntegration/HoneypotIntegration.class.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/wmf-deployment/extensions/HoneypotIntegration/HoneypotIntegration.class.php:55331
+
/branches/wmf-deployment/extensions/HoneypotIntegration/HoneypotIntegration.class.php:55331,60970,62002
Property changes on: branches/wmf/1.16wmf4/extensions/LiquidThreads
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/LiquidThreads:57390,63727-63971
+ /branches/wmf-deployment/extensions/LiquidThreads:60970,62002
/trunk/extensions/LiquidThreads:57390,63727-63971
Property changes on: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/LiquidThreads:57390,63727-63971
+ /branches/wmf-deployment/extensions/LiquidThreads_alpha:60970,62002
/trunk/extensions/LiquidThreads:57390,63727-63971
Property changes on: branches/wmf/1.16wmf4/extensions/LocalisationUpdate
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/extensions/LocalisationUpdate:55198
+ /branches/wmf-deployment/extensions/LocalisationUpdate:60970,62002
/trunk/phase3/extensions/LocalisationUpdate:55198
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/ballots/Ballot.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/ballots/Ballot.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/crypt/Crypt.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/crypt/Crypt.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/crypt/Random.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/crypt/Random.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Election.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/entities/Election.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Entity.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/entities/Entity.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Option.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/entities/Option.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Question.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/entities/Question.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/main/Base.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/main/Base.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/main/Context.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/main/Context.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/main/Store.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/main/Store.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/DetailsPage.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/DetailsPage.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/DumpPage.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/DumpPage.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/EntryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/EntryPage.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/ListPage.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/ListPage.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/LoginPage.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/LoginPage.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/MessageDumpPage.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/MessageDumpPage.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/Page.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/Page.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/TallyPage.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/TallyPage.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/TranslatePage.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/TranslatePage.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/VotePage.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/pages/VotePage.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/talliers/ElectionTallier.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/talliers/ElectionTallier.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/talliers/Tallier.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/talliers/Tallier.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/user/Auth.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/user/Auth.php:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/SecurePoll/includes/user/Voter.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/SecurePoll/includes/user/Voter.php:60970,62002
Property changes on: branches/wmf/1.16wmf4/extensions/StringFunctionsEscaped
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/StringFunctionsEscaped:51646
+ /branches/REL1_15/phase3/extensions/StringFunctionsEscaped:51646
/branches/wmf-deployment/extensions/StringFunctionsEscaped:60970,62002
Property changes on: branches/wmf/1.16wmf4/extensions/TrustedXFF
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wmf-deployment/extensions/TrustedXFF:53263
+ /branches/wmf-deployment/extensions/TrustedXFF:53263,60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/TrustedXFF/trusted-hosts.txt
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/wmf-deployment/extensions/TrustedXFF/trusted-hosts.txt:53263,55331
+
/branches/wmf-deployment/extensions/TrustedXFF/trusted-hosts.txt:53263,55331,60970,62002
Modified:
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Highlight/Highlight.js
===================================================================
---
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Highlight/Highlight.js
2010-03-25 06:28:28 UTC (rev 64149)
+++
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Highlight/Highlight.js
2010-03-25 06:29:20 UTC (rev 64150)
@@ -2,7 +2,7 @@
$j(document).ready( function() {
// Check preferences for highlight
- if ( !wgWikiEditorEnabledModules.highlight ) {
+ if ( !wgWikiEditorEnabledModules.toc ) {
return true;
}
// Add the highlight module
Modified:
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===================================================================
---
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-03-25 06:28:28 UTC (rev 64149)
+++
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-03-25 06:29:20 UTC (rev 64150)
@@ -2,7 +2,7 @@
$j(document).ready( function() {
// Check preferences for highlight
- if ( !wgWikiEditorEnabledModules.highlight ) {
+ if ( !wgWikiEditorEnabledModules.toc ) {
return true;
}
// Add the highlight module
Modified:
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===================================================================
---
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-03-25 06:28:28 UTC (rev 64149)
+++
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-03-25 06:29:20 UTC (rev 64150)
@@ -1,5 +1,5 @@
-$j(document).ready(function(){if(!wgWikiEditorEnabledModules.highlight){return
true;}
+$j(document).ready(function(){if(!wgWikiEditorEnabledModules.toc){return true;}
if($j.fn.wikiEditor){$j('textarea#wpTextbox1').wikiEditor('addModule','highlight');}});$j(document).ready(function(){if(!wgWikiEditorEnabledModules.preview){return
true;}
if($j.fn.wikiEditor){$j('textarea#wpTextbox1').wikiEditor('addModule','preview');}});$j(document).ready(function(){if(!wgWikiEditorEnabledModules.publish){return
true;}
if($j.fn.wikiEditor){$j('textarea#wpTextbox1').wikiEditor('addModule','publish');}});$j(document).ready(function(){if(!wgWikiEditorPreferences||!(wgWikiEditorPreferences.toc&&wgWikiEditorPreferences.toc.enable)){return
true;}
Property changes on:
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:60970,62002
Property changes on:
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:60970,62002
Property changes on: branches/wmf/1.16wmf4/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381,60970,62002
/trunk/phase3/includes:63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
/trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/wmf-deployment/includes/ChangesList.php:53381,57589,60970,62002
/trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901
+ /branches/wmf-deployment/includes/ConfEditor.php:60970,62002
/trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901
Modified: branches/wmf/1.16wmf4/includes/DefaultSettings.php
===================================================================
--- branches/wmf/1.16wmf4/includes/DefaultSettings.php 2010-03-25 06:28:28 UTC
(rev 64149)
+++ branches/wmf/1.16wmf4/includes/DefaultSettings.php 2010-03-25 06:29:20 UTC
(rev 64150)
@@ -33,8 +33,7 @@
}
/** MediaWiki version number */
-$wgVersion = '1.16.0beta1';
-
+$wgVersion = '1.16wmf4'
/** Name of the site. It must be changed in LocalSettings.php */
$wgSitename = 'MediaWiki';
Property changes on: branches/wmf/1.16wmf4/includes/HistoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/PageHistory.php:51646
/trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/wmf-deployment/includes/HistoryPage.php:60970,62002
/trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/includes/LocalisationCache.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/LocalisationCache.php:51646
/branches/sqlite/includes/LocalisationCache.php:58211-58321
/branches/wmf-deployment/includes/LocalisationCache.php:53381
/trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/LocalisationCache.php:51646
/branches/sqlite/includes/LocalisationCache.php:58211-58321
/branches/wmf-deployment/includes/LocalisationCache.php:53381,60970,62002
/trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381,57468,60970,62002
/trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api:51646
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/api:51646
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952,60970,62002
/trunk/phase3/includes/api:63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/includes/json/Services_JSON.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/branches/wmf-deployment/includes/json/Services_JSON.php:60970,62002
/trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967,60970,62002
/trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901
Modified: branches/wmf/1.16wmf4/languages/LanguageConverter.php
===================================================================
--- branches/wmf/1.16wmf4/languages/LanguageConverter.php 2010-03-25
06:28:28 UTC (rev 64149)
+++ branches/wmf/1.16wmf4/languages/LanguageConverter.php 2010-03-25
06:29:20 UTC (rev 64150)
@@ -766,7 +766,8 @@
$this->mTables = false;
if ( $fromcache ) {
wfProfileIn( __METHOD__ . '-cache' );
- $this->mTables = $wgMemc->get( $this->mCacheKey );
+ //$this->mTables = $wgMemc->get( $this->mCacheKey );
+ $this->mTables = apc_fetch( $this->mCacheKey );
wfProfileOut( __METHOD__ . '-cache' );
}
if ( !$this->mTables
@@ -784,8 +785,9 @@
$this->postLoadTables();
$this->mTables[self::CACHE_VERSION_KEY] = true;
- $wgMemc->set( $this->mCacheKey, $this->mTables, 43200 );
- wfProfileOut( __METHOD__ . '-recache' );
+ // $wgMemc->set($this->mCacheKey, $this->mTables,
43200);
+ apc_store($this->mCacheKey, $this->mTables, 43200);
+ wfProfileOut( __METHOD__.'-recache' );
}
wfProfileOut( __METHOD__ );
}
Property changes on: branches/wmf/1.16wmf4/maintenance/cleanupTable.inc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
/trunk/phase3/maintenance/cleanupTable.inc:63549,63764,63897-63901
+ /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715,60970,62002
/trunk/phase3/maintenance/cleanupTable.inc:63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/maintenance/deleteSelfExternals.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646
/trunk/phase3/maintenance/deleteSelfExternals.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,63549,63764,63897-63901
+ /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646
/branches/wmf-deployment/maintenance/deleteSelfExternals.php:60970,62002
/trunk/phase3/maintenance/deleteSelfExternals.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/maintenance/jobs-loop.sh
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/jobs-loop.sh:51646
/trunk/phase3/maintenance/jobs-loop.sh:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,56325,56862,56867,57154-57447,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/maintenance/jobs-loop.sh:51646
/branches/wmf-deployment/maintenance/jobs-loop.sh:60970,62002
/trunk/phase3/maintenance/jobs-loop.sh:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,56325,56862,56867,57154-57447,57541,57916,58151,58219,58633,58816
Property changes on: branches/wmf/1.16wmf4/maintenance/moveBatch.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/moveBatch.php:51646
/branches/sqlite/maintenance/moveBatch.php:58211-58321
/trunk/phase3/maintenance/moveBatch.php:63397,63549,63764,63897-63901
+ /branches/REL1_15/phase3/maintenance/moveBatch.php:51646
/branches/sqlite/maintenance/moveBatch.php:58211-58321
/branches/wmf-deployment/maintenance/moveBatch.php:60970,62002
/trunk/phase3/maintenance/moveBatch.php:63397,63549,63764,63897-63901
Property changes on:
branches/wmf/1.16wmf4/maintenance/storage/recompressTracked.sh
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/storage/recompressTracked.sh:51646
/trunk/phase3/maintenance/storage/recompressTracked.sh:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,56325,56862,56867,57154-57447,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/maintenance/storage/recompressTracked.sh:51646
/branches/wmf-deployment/maintenance/storage/recompressTracked.sh:60970,62002
/trunk/phase3/maintenance/storage/recompressTracked.sh:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,56325,56862,56867,57154-57447,57541,57916,58151,58219,58633,58816
Property changes on:
branches/wmf/1.16wmf4/maintenance/storage/testRctComplete.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/storage/testRctComplete.php:51646
/trunk/phase3/maintenance/storage/testRctComplete.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,56325,56862,56867,57154-57447,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/maintenance/storage/testRctComplete.php:51646
/branches/wmf-deployment/maintenance/storage/testRctComplete.php:60970,62002
/trunk/phase3/maintenance/storage/testRctComplete.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,56325,56862,56867,57154-57447,57541,57916,58151,58219,58633,58816
Property changes on: branches/wmf/1.16wmf4/math/GNUmakefile
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/math/GNUmakefile:51646
/trunk/phase3/math/GNUmakefile:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,56325,57154-57447,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/math/GNUmakefile:51646
/branches/wmf-deployment/math/GNUmakefile:60970,62002
/trunk/phase3/math/GNUmakefile:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,56325,57154-57447,57541,57916,58151,58219,58633,58816
Property changes on: branches/wmf/1.16wmf4/skins/common/jquery.js
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/skins/common/jquery.js:63549,63764,63897-63901
+ /branches/wmf-deployment/skins/common/jquery.js:62002
/trunk/phase3/skins/common/jquery.js:63549,63764,63897-63901
Property changes on: branches/wmf/1.16wmf4/skins/common/jquery.min.js
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/skins/common/jquery.min.js:63549,63764,63897-63901
+ /branches/wmf-deployment/skins/common/jquery.min.js:62002
/trunk/phase3/skins/common/jquery.min.js:63549,63764,63897-63901
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
