| Property changes on: branches/REL1_18/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/phase3/extensions:r103450*,105372*,105419* |
| Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -16,8 +16,10 @@ |
| 17 | 17 | * (bug 30774) mediawiki.html: Add support for numbers and booleans in the |
| 18 | 18 | attribute values and element contents. |
| 19 | 19 | * (bug 32473) [[Special:PasswordReset]] can not be used on private wiki |
| | 20 | +* (bug 32843) DBA cache broken |
| | 21 | +* (bug 328786) Backward compatibility for extension using 1.17's Database::newFromType() |
| | 22 | +* fix stack trace when using WhatLinksHere on a Media: file |
| 20 | 23 | |
| 21 | | - |
| 22 | 24 | == MediaWiki 1.18 == |
| 23 | 25 | 2011-11-24 |
| 24 | 26 | |
| Property changes on: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 25 | 27 | Merged /trunk/phase3/RELEASE-NOTES-1.18:r103450,105372 |
| Index: branches/REL1_18/phase3/includes/objectcache/DBABagOStuff.php |
| — | — | @@ -6,20 +6,23 @@ |
| 7 | 7 | * writer locks. Intended for development use only, as a memcached workalike |
| 8 | 8 | * for systems that don't have it. |
| 9 | 9 | * |
| | 10 | + * On construction you can pass array( 'dir' => '/some/path' ); as a parameter |
| | 11 | + * to override the default DBA files directory (wgTmpDirectory). |
| | 12 | + * |
| 10 | 13 | * @ingroup Cache |
| 11 | 14 | */ |
| 12 | 15 | class DBABagOStuff extends BagOStuff { |
| 13 | 16 | var $mHandler, $mFile, $mReader, $mWriter, $mDisabled; |
| 14 | 17 | |
| 15 | | - public function __construct( $dir = false ) { |
| | 18 | + public function __construct( $params ) { |
| 16 | 19 | global $wgDBAhandler; |
| 17 | 20 | |
| 18 | | - if ( $dir === false ) { |
| | 21 | + if ( !isset( $params['dir'] ) ) { |
| 19 | 22 | global $wgTmpDirectory; |
| 20 | | - $dir = $wgTmpDirectory; |
| | 23 | + $params['dir'] = $wgTmpDirectory; |
| 21 | 24 | } |
| 22 | 25 | |
| 23 | | - $this->mFile = "$dir/mw-cache-" . wfWikiID(); |
| | 26 | + $this->mFile = $params['dir']."/mw-cache-" . wfWikiID(); |
| 24 | 27 | $this->mFile .= '.db'; |
| 25 | 28 | wfDebug( __CLASS__ . ": using cache file {$this->mFile}\n" ); |
| 26 | 29 | $this->mHandler = $wgDBAhandler; |
| Index: branches/REL1_18/phase3/includes/db/Database.php |
| — | — | @@ -590,6 +590,19 @@ |
| 591 | 591 | } |
| 592 | 592 | |
| 593 | 593 | /** |
| | 594 | + * Same as new factory( ... ), kept for backward compatibility |
| | 595 | + * @deprecated since 1.18 |
| | 596 | + * @see Database::factory() |
| | 597 | + */ |
| | 598 | + public final static function newFromType( $dbType, $p = array() ) { |
| | 599 | + wfDeprecated( __METHOD__ ); |
| | 600 | + if ( isset( $p['tableprefix'] ) ) { |
| | 601 | + $p['tablePrefix'] = $p['tableprefix']; |
| | 602 | + } |
| | 603 | + return self::factory( $dbType, $p ); |
| | 604 | + } |
| | 605 | + |
| | 606 | + /** |
| 594 | 607 | * Given a DB type, construct the name of the appropriate child class of |
| 595 | 608 | * DatabaseBase. This is designed to replace all of the manual stuff like: |
| 596 | 609 | * $class = 'Database' . ucfirst( strtolower( $type ) ); |
| Property changes on: branches/REL1_18/phase3/includes/db/Database.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 597 | 610 | Merged /trunk/phase3/includes/db/Database.php:r103450,105372 |
| Index: branches/REL1_18/phase3/includes/SkinTemplate.php |
| — | — | @@ -853,7 +853,7 @@ |
| 854 | 854 | wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this, &$preventActiveTabs ) ); |
| 855 | 855 | |
| 856 | 856 | // Checks if page is some kind of content |
| 857 | | - if( $title->getNamespace() != NS_SPECIAL ) { |
| | 857 | + if( $title->canExist() ) { |
| 858 | 858 | // Gets page objects for the related namespaces |
| 859 | 859 | $subjectPage = $title->getSubjectPage(); |
| 860 | 860 | $talkPage = $title->getTalkPage(); |
| Index: branches/REL1_18/phase3/includes/DefaultSettings.php |
| — | — | @@ -1511,6 +1511,8 @@ |
| 1512 | 1512 | * given, giving a callable function which will generate a suitable cache object. |
| 1513 | 1513 | * |
| 1514 | 1514 | * The other parameters are dependent on the class used. |
| | 1515 | + * - CACHE_DBA uses $wgTmpDirectory by default. The 'dir' parameter let you |
| | 1516 | + * overrides that. |
| 1515 | 1517 | */ |
| 1516 | 1518 | $wgObjectCaches = array( |
| 1517 | 1519 | CACHE_NONE => array( 'class' => 'EmptyBagOStuff' ), |