r85236 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r85235‎ | r85236 | r85237 >
Date:09:44, 3 April 2011
Author:ialex
Status:ok
Tags:
Comment:
* Drop 5.1 compat code
* Fix one more PHP version requirement
Modified paths:
  • /trunk/phase3/includes/AutoLoader.php (modified) (history)
  • /trunk/phase3/includes/GlobalFunctions.php (modified) (history)
  • /trunk/phase3/includes/Hooks.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/GlobalFunctions.php
@@ -16,7 +16,7 @@
1717 /**
1818 * Compatibility functions
1919 *
20 - * We support PHP 5.1.x and up.
 20+ * We support PHP 5.2.3 and up.
2121 * Re-implementations of newer functions or functions in non-standard
2222 * PHP extensions may be included here.
2323 */
Index: trunk/phase3/includes/Hooks.php
@@ -203,8 +203,6 @@
204204 } elseif ( isset( $object ) ) {
205205 $func = get_class( $object ) . '::' . $method;
206206 $callback = array( $object, $method );
207 - } elseif ( false !== ( $pos = strpos( $func, '::' ) ) ) {
208 - $callback = array( substr( $func, 0, $pos ), substr( $func, $pos + 2 ) );
209207 } else {
210208 $callback = $func;
211209 }
Index: trunk/phase3/includes/AutoLoader.php
@@ -835,12 +835,4 @@
836836 }
837837 }
838838
839 -if ( function_exists( 'spl_autoload_register' ) ) {
840 - spl_autoload_register( array( 'AutoLoader', 'autoload' ) );
841 -} else {
842 - function __autoload( $class ) {
843 - AutoLoader::autoload( $class );
844 - }
845 -
846 - ini_set( 'unserialize_callback_func', '__autoload' );
847 -}
 839+spl_autoload_register( array( 'AutoLoader', 'autoload' ) );

Follow-up revisions

RevisionCommit summaryAuthorDate
r85304Partial revert of r85236: __autoload() is needed for HipHop interpreted mode ...tstarling01:12, 4 April 2011

Status & tagging log