https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114980
Revision: 114980
Author: aaron
Date: 2012-04-19 21:33:44 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
Bug 36083 - Use trigger_error(..., E_USER_ERROR) instead of just exiting out.
Modified Paths:
--------------
trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php
Modified: trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php
===================================================================
--- trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php 2012-04-19
21:25:41 UTC (rev 114979)
+++ trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php 2012-04-19
21:33:44 UTC (rev 114980)
@@ -217,11 +217,11 @@
* This converts shell commands like "php $IP/maintenance/foo.php" into
* commands that use the "MWScript.php" wrapper, for example:
* "php /home/wikipedia/common/multiversion/MWScript.php
maintenance/foo.php"
- *
+ *
* @param &$script string
* @param &$params Array
* @param &$options Array
- * @return boolean
+ * @return boolean
*/
public static function onWfShellMaintenanceCmd( &$script, array
&$params, array &$options ) {
global $IP;
@@ -339,6 +339,7 @@
}
header( 'HTTP/1.1 500 Internal server error' );
echo $msg;
- exit( 1 );
+ trigger_error( $msg, E_USER_ERROR );
+ exit( 1 ); // sanity
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
