wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-25 00:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove static object cache to avoid cross wiki related issue"

Browse source
This commit is contained in:
jenkins-bot 2013-04-19 21:55:37 +00:00 committed by Gerrit Code Review
parent 09f6abe044 e9d042283c
commit 724470ce02
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/EchoBackend.php
View file

@ -7,8 +7,6 @@
*/ */
abstract class MWEchoBackend { abstract class MWEchoBackend {
private static $cache = array();
/** /**
* Factory to initialize a backend class * Factory to initialize a backend class
* @param $backend string * @param $backend string
@ -24,11 +22,7 @@ abstract class MWEchoBackend {
throw new MWException( "$backend backend is not supported" ); throw new MWException( "$backend backend is not supported" );
} }
if ( !isset( self::$cache[$backend] ) ) { return new $className();
self::$cache[$backend] = new $className();
}
return self::$cache[$backend];
} }
/** /**

6
includes/EmailBundler.php
View file

@ -68,7 +68,7 @@ abstract class MWEchoEmailBundler {
$className = 'MW' . $wgEchoBackendName . 'EchoEmailBundler'; $className = 'MW' . $wgEchoBackendName . 'EchoEmailBundler';
if ( !class_exists( $className ) ) { if ( !class_exists( $className ) ) {
throw new MWException( "$wgEchoBackendName email batch is not supported!" ); throw new MWException( "$wgEchoBackendName email bundler is not supported!" );
} }
return $className; return $className;
@ -131,11 +131,7 @@ abstract class MWEchoEmailBundler {
return $this->emailInterval + 600; return $this->emailInterval + 600;
} }
static $now;
if ( !$now ) {
$now = wfTimestamp( TS_UNIX ); $now = wfTimestamp( TS_UNIX );
}
return $now - wfTimestamp( TS_UNIX, $this->timestamp ); return $now - wfTimestamp( TS_UNIX, $this->timestamp );
} }