Merge "Deprecate wfCheckLimits(), nothing calls this anymore"

diff --combined includes/GlobalFunctions.php
index c67cbd5,eac4017..c1908af
--- 1/includes/GlobalFunctions.php
--- 2/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -1891,8 -1891,13 +1891,8 @@@ function wfReportTime() 
  /**
   * Safety wrapper for debug_backtrace().
   *
 - * With Zend Optimizer 3.2.0 loaded, this causes segfaults under somewhat
 - * murky circumstances, which may be triggered in part by stub objects
 - * or other fancy talking'.
 - *
 - * Will return an empty array if Zend Optimizer is detected or if
 - * debug_backtrace is disabled, otherwise the output from
 - * debug_backtrace() (trimmed).
 + * Will return an empty array if debug_backtrace is disabled, otherwise
 + * the output from debug_backtrace() (trimmed).
   *
   * @param int $limit This parameter can be used to limit the number of stack frames returned
   *
@@@ -1901,10 -1906,19 +1901,10 @@@
  function wfDebugBacktrace( $limit = 0 ) {
        static $disabled = null;
  
 -      if ( extension_loaded( 'Zend Optimizer' ) ) {
 -              wfDebug( "Zend Optimizer detected; skipping debug_backtrace for safety.\n" );
 -              return array();
 -      }
 -
        if ( is_null( $disabled ) ) {
 -              $disabled = false;
 -              $functions = explode( ',', ini_get( 'disable_functions' ) );
 -              $functions = array_map( 'trim', $functions );
 -              $functions = array_map( 'strtolower', $functions );
 -              if ( in_array( 'debug_backtrace', $functions ) ) {
 -                      wfDebug( "debug_backtrace is in disabled_functions\n" );
 -                      $disabled = true;
 +              $disabled = !function_exists( 'debug_backtrace' );
 +              if ( $disabled ) {
 +                      wfDebug( "debug_backtrace() is disabled\n" );
                }
        }
        if ( $disabled ) {
@@@ -2097,9 -2111,11 +2097,11 @@@ function wfClientAcceptsGzip( $force = 
   * @param int $deflimit Default limit if none supplied
   * @param string $optionname Name of a user preference to check against
   * @return array
+  * @deprecated since 1.24, just call WebRequest::getLimitOffset() directly
   */
  function wfCheckLimits( $deflimit = 50, $optionname = 'rclimit' ) {
        global $wgRequest;
+       wfDeprecated( __METHOD__, '1.24' );
        return $wgRequest->getLimitOffset( $deflimit, $optionname );
  }
  
@@@ -2804,14 -2820,18 +2806,14 @@@ function wfEscapeShellArg( /*...*/ ) 
  function wfShellExecDisabled() {
        static $disabled = null;
        if ( is_null( $disabled ) ) {
 -              $disabled = false;
                if ( wfIniGetBool( 'safe_mode' ) ) {
                        wfDebug( "wfShellExec can't run in safe_mode, PHP's exec functions are too broken.\n" );
                        $disabled = 'safemode';
 +              } elseif ( !function_exists( 'proc_open' ) ) {
 +                      wfDebug( "proc_open() is disabled\n" );
 +                      $disabled = 'disabled';
                } else {
 -                      $functions = explode( ',', ini_get( 'disable_functions' ) );
 -                      $functions = array_map( 'trim', $functions );
 -                      $functions = array_map( 'strtolower', $functions );
 -                      if ( in_array( 'proc_open', $functions ) ) {
 -                              wfDebug( "proc_open is in disabled_functions\n" );
 -                              $disabled = 'disabled';
 -                      }
 +                      $disabled = false;
                }
        }
        return $disabled;
@@@ -2873,7 -2893,7 +2875,7 @@@ function wfShellExec( $cmd, &$retval = 
        $cmd = $envcmd . $cmd;
  
        $useLogPipe = false;
 -      if ( php_uname( 's' ) == 'Linux' ) {
 +      if ( is_executable( '/bin/bash' ) ) {
                $time = intval ( isset( $limits['time'] ) ? $limits['time'] : $wgMaxShellTime );
                if ( isset( $limits['walltime'] ) ) {
                        $wallTime = intval( $limits['walltime'] );