| Property changes on: branches/wmf/1.16wmf4/StartProfiler.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /branches/wmf-deployment/StartProfiler.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/math/GNUmakefile |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /branches/wmf-deployment/math/GNUmakefile:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/Collection |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /branches/wmf-deployment/extensions/Collection:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SyntaxHighlight_GeSHi |
| ___________________________________________________________________ |
| Deleted: svn:externals |
| 4 | 4 | - geshi http://geshi.svn.sourceforge.net/svnroot/geshi/tags/RELEASE_1_0_8_6/geshi-1.0.X/src |
| Property changes on: branches/wmf/1.16wmf4/extensions/TrustedXFF/trusted-hosts.txt |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 5 | 5 | Merged /branches/wmf-deployment/extensions/TrustedXFF/trusted-hosts.txt:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/TrustedXFF |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 6 | 6 | Merged /branches/wmf-deployment/extensions/TrustedXFF:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/lqt.css |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 7 | 7 | Merged /branches/wmf-deployment/extensions/LiquidThreads_alpha/lqt.css:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 8 | 8 | Merged /branches/wmf-deployment/extensions/LiquidThreads_alpha:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/InputBox |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Merged /branches/wmf-deployment/extensions/InputBox:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/user/Voter.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 10 | 10 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/user/Voter.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/user/Auth.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 11 | 11 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/user/Auth.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/LoginPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 12 | 12 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/LoginPage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/MessageDumpPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 13 | 13 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/MessageDumpPage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/ListPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 14 | 14 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/ListPage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/TranslatePage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 15 | 15 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/TranslatePage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/VotePage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 16 | 16 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/VotePage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/Page.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 17 | 17 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/Page.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/EntryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18 | 18 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/EntryPage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/DetailsPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 19 | 19 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/DetailsPage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/DumpPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 20 | 20 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/DumpPage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/pages/TallyPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 21 | 21 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/pages/TallyPage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/talliers/Tallier.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 22 | 22 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/talliers/Tallier.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/talliers/ElectionTallier.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 23 | 23 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/talliers/ElectionTallier.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/ballots/Ballot.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 24 | 24 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/ballots/Ballot.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/crypt/Random.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 25 | 25 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/crypt/Random.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/crypt/Crypt.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 26 | 26 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/crypt/Crypt.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Question.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 27 | 27 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/entities/Question.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Option.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 28 | 28 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/entities/Option.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Entity.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 29 | 29 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/entities/Entity.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/entities/Election.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 30 | 30 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/entities/Election.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/main/Context.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 31 | 31 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/main/Context.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/main/Base.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 32 | 32 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/main/Base.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/SecurePoll/includes/main/Store.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 33 | 33 | Merged /branches/wmf-deployment/extensions/SecurePoll/includes/main/Store.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/ExtensionDistributor |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 34 | 34 | Merged /branches/wmf-deployment/extensions/ExtensionDistributor:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/ContactPageFundraiser |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 35 | 35 | Merged /branches/wmf-deployment/extensions/ContactPageFundraiser:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/FundraiserPortal |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 36 | 36 | Merged /branches/wmf-deployment/extensions/FundraiserPortal:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/ConditionalShowSection |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 37 | 37 | Merged /branches/wmf-deployment/extensions/ConditionalShowSection:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 38 | 38 | Merged /branches/wmf-deployment/extensions/UsabilityInitiative/OptIn:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 39 | 39 | Merged /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 40 | 40 | Merged /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 41 | 41 | Merged /branches/wmf-deployment/extensions/UsabilityInitiative:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/LiquidThreads/lqt.css |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 42 | 42 | Merged /branches/wmf-deployment/extensions/LiquidThreads/lqt.css:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/LiquidThreads |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 43 | 43 | Merged /branches/wmf-deployment/extensions/LiquidThreads:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/HoneypotIntegration/HoneypotIntegration.class.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 44 | 44 | Merged /branches/wmf-deployment/extensions/HoneypotIntegration/HoneypotIntegration.class.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/LocalisationUpdate |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 45 | 45 | Merged /branches/wmf-deployment/extensions/LocalisationUpdate:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/CentralAuth |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 46 | 46 | Merged /branches/wmf-deployment/extensions/CentralAuth:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/StringFunctionsEscaped |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 47 | 47 | Merged /branches/wmf-deployment/extensions/StringFunctionsEscaped:r60970 |
| Property changes on: branches/wmf/1.16wmf4/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 48 | 48 | Merged /branches/wmf-deployment/extensions/FlaggedRevs:r60970 |
| Index: branches/wmf/1.16wmf4/languages/LanguageConverter.php |
| — | — | @@ -766,7 +766,8 @@ |
| 767 | 767 | $this->mTables = false; |
| 768 | 768 | if ( $fromcache ) { |
| 769 | 769 | wfProfileIn( __METHOD__ . '-cache' ); |
| 770 | | - $this->mTables = $wgMemc->get( $this->mCacheKey ); |
| | 770 | + //$this->mTables = $wgMemc->get( $this->mCacheKey ); |
| | 771 | + $this->mTables = apc_fetch( $this->mCacheKey ); |
| 771 | 772 | wfProfileOut( __METHOD__ . '-cache' ); |
| 772 | 773 | } |
| 773 | 774 | if ( !$this->mTables |
| — | — | @@ -784,8 +785,9 @@ |
| 785 | 786 | $this->postLoadTables(); |
| 786 | 787 | $this->mTables[self::CACHE_VERSION_KEY] = true; |
| 787 | 788 | |
| 788 | | - $wgMemc->set( $this->mCacheKey, $this->mTables, 43200 ); |
| 789 | | - wfProfileOut( __METHOD__ . '-recache' ); |
| | 789 | + // $wgMemc->set($this->mCacheKey, $this->mTables, 43200); |
| | 790 | + apc_store($this->mCacheKey, $this->mTables, 43200); |
| | 791 | + wfProfileOut( __METHOD__.'-recache' ); |
| 790 | 792 | } |
| 791 | 793 | wfProfileOut( __METHOD__ ); |
| 792 | 794 | } |
| Property changes on: branches/wmf/1.16wmf4/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 793 | 795 | Merged /branches/wmf-deployment/includes/HistoryPage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/includes/LocalisationCache.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 794 | 796 | Merged /branches/wmf-deployment/includes/LocalisationCache.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/includes/json/Services_JSON.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 795 | 797 | Merged /branches/wmf-deployment/includes/json/Services_JSON.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 796 | 798 | Merged /branches/wmf-deployment/includes/OutputPage.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/includes/ChangesList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 797 | 799 | Merged /branches/wmf-deployment/includes/ChangesList.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 798 | 800 | Merged /branches/wmf-deployment/includes/specials:r60970 |
| Property changes on: branches/wmf/1.16wmf4/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 799 | 801 | Merged /branches/wmf-deployment/includes/ConfEditor.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 800 | 802 | Merged /branches/wmf-deployment/includes/api:r60970 |
| Index: branches/wmf/1.16wmf4/includes/DefaultSettings.php |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** MediaWiki version number */ |
| 37 | | -$wgVersion = '1.16.0beta2'; |
| | 37 | +$wgVersion = '1.16wmf4'; |
| 38 | 38 | |
| 39 | 39 | /** Name of the site. It must be changed in LocalSettings.php */ |
| 40 | 40 | $wgSitename = 'MediaWiki'; |
| Property changes on: branches/wmf/1.16wmf4/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 41 | 41 | Merged /branches/wmf-deployment/includes:r60970 |
| Property changes on: branches/wmf/1.16wmf4/maintenance/moveBatch.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 42 | 42 | Merged /branches/wmf-deployment/maintenance/moveBatch.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/maintenance/storage/testRctComplete.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 43 | 43 | Merged /branches/wmf-deployment/maintenance/storage/testRctComplete.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/maintenance/storage/make-all-blobs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 44 | 44 | Merged /branches/wmf-deployment/maintenance/storage/make-all-blobs:r60970 |
| Property changes on: branches/wmf/1.16wmf4/maintenance/storage/recompressTracked.sh |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 45 | 45 | Merged /branches/wmf-deployment/maintenance/storage/recompressTracked.sh:r60970 |
| Property changes on: branches/wmf/1.16wmf4/maintenance/jobs-loop.sh |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 46 | 46 | Merged /branches/wmf-deployment/maintenance/jobs-loop.sh:r60970 |
| Property changes on: branches/wmf/1.16wmf4/maintenance/deleteSelfExternals.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 47 | 47 | Merged /branches/wmf-deployment/maintenance/deleteSelfExternals.php:r60970 |
| Property changes on: branches/wmf/1.16wmf4/maintenance/cleanupTable.inc |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 48 | 48 | Merged /branches/wmf-deployment/maintenance/cleanupTable.inc:r60970 |
| Property changes on: branches/wmf/1.16wmf4 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 49 | 49 | Merged /branches/wmf-deployment:r60970 |