jenkins-bot has submitted this change and it was merged.
Change subject: fix function ErrorHandler::onError() (v 3.4.4)
......................................................................
fix function ErrorHandler::onError() (v 3.4.4)
Change-Id: I603bc467d32aa15d666174e637a210374f5bd6bd
---
M PhpTags.php
M includes/ErrorHandler.php
2 files changed, 3 insertions(+), 9 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PhpTags.php b/PhpTags.php
index 00c413e..0390765 100644
--- a/PhpTags.php
+++ b/PhpTags.php
@@ -17,7 +17,7 @@
const PHPTAGS_MAJOR_VERSION = 3;
const PHPTAGS_MINOR_VERSION = 4;
-const PHPTAGS_RELEASE_VERSION = 3;
+const PHPTAGS_RELEASE_VERSION = 4;
define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION
. '.' . PHPTAGS_RELEASE_VERSION );
const PHPTAGS_HOOK_RELEASE = 5;
diff --git a/includes/ErrorHandler.php b/includes/ErrorHandler.php
index 84f9a47..38a7f61 100644
--- a/includes/ErrorHandler.php
+++ b/includes/ErrorHandler.php
@@ -10,15 +10,9 @@
public static function onError( $errno, $errstr, $errfile, $errline,
$errcontext, $object = false ) {
if ( $object === false ) {
- self::$oldErrorHandler = null;
- $return = self::onPhpError( $errno, $errstr, $errfile,
$errline, $errcontext );
- } else {
- $return = self::onHhvmError( $errno, $errstr, $errfile,
$errline, $object );
+ return self::onPhpError( $errno, $errstr, $errfile,
$errline, $errcontext );
}
- if ( false === $return && self::$oldErrorHandler !== null ) {
- $return = call_user_func_array( self::$oldErrorHandler,
func_get_args() );
- }
- return $return;
+ return self::onHhvmError( $errno, $errstr, $errfile, $errline,
$object );
}
private static function onPhpError( $errno, $errstr, $errfile,
$errline, $object) {
--
To view, visit https://gerrit.wikimedia.org/r/154994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I603bc467d32aa15d666174e637a210374f5bd6bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhpTags
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <[email protected]>
Gerrit-Reviewer: Pastakhov <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
