diff --git a/includes/EchoBackend.php b/includes/EchoBackend.php index 2ee2ba113..d1d212349 100644 --- a/includes/EchoBackend.php +++ b/includes/EchoBackend.php @@ -7,8 +7,6 @@ */ abstract class MWEchoBackend { - private static $cache = array(); - /** * Factory to initialize a backend class * @param $backend string @@ -24,11 +22,7 @@ abstract class MWEchoBackend { throw new MWException( "$backend backend is not supported" ); } - if ( !isset( self::$cache[$backend] ) ) { - self::$cache[$backend] = new $className(); - } - - return self::$cache[$backend]; + return new $className(); } /** diff --git a/includes/EmailBundler.php b/includes/EmailBundler.php index 3fa5f0179..89d36dd65 100644 --- a/includes/EmailBundler.php +++ b/includes/EmailBundler.php @@ -68,7 +68,7 @@ abstract class MWEchoEmailBundler { $className = 'MW' . $wgEchoBackendName . 'EchoEmailBundler'; if ( !class_exists( $className ) ) { - throw new MWException( "$wgEchoBackendName email batch is not supported!" ); + throw new MWException( "$wgEchoBackendName email bundler is not supported!" ); } return $className; @@ -131,11 +131,7 @@ abstract class MWEchoEmailBundler { return $this->emailInterval + 600; } - static $now; - - if ( !$now ) { - $now = wfTimestamp( TS_UNIX ); - } + $now = wfTimestamp( TS_UNIX ); return $now - wfTimestamp( TS_UNIX, $this->timestamp ); }