Revision: 51764
Author: demon
Date: 2009-06-11 22:13:41 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
Backport r49572 to 1.15 (move up getMemcKey() from LocalRepo to FileRepo).
Modified Paths:
--------------
branches/REL1_15/phase3/includes/filerepo/FileRepo.php
branches/REL1_15/phase3/includes/filerepo/LocalRepo.php
Modified: branches/REL1_15/phase3/includes/filerepo/FileRepo.php
===================================================================
--- branches/REL1_15/phase3/includes/filerepo/FileRepo.php 2009-06-11
21:49:22 UTC (rev 51763)
+++ branches/REL1_15/phase3/includes/filerepo/FileRepo.php 2009-06-11
22:13:41 UTC (rev 51764)
@@ -598,4 +598,8 @@
function getMasterDB() {
return wfGetDB( DB_MASTER );
}
+
+ function getMemcKey( $key ) {
+ return wfWikiID( $this->getSlaveDB() ) . ":{$key}";
+ }
}
Modified: branches/REL1_15/phase3/includes/filerepo/LocalRepo.php
===================================================================
--- branches/REL1_15/phase3/includes/filerepo/LocalRepo.php 2009-06-11
21:49:22 UTC (rev 51763)
+++ branches/REL1_15/phase3/includes/filerepo/LocalRepo.php 2009-06-11
22:13:41 UTC (rev 51764)
@@ -10,10 +10,6 @@
var $fileFromRowFactory = array( 'LocalFile', 'newFromRow' );
var $oldFileFromRowFactory = array( 'OldLocalFile', 'newFromRow' );
- function getMemcKey( $key ) {
- return wfWikiID( $this->getSlaveDB() ) . ":{$key}";
- }
-
function newFileFromRow( $row ) {
if ( isset( $row->img_name ) ) {
return call_user_func( $this->fileFromRowFactory, $row,
$this );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
