From ed6e8766887399c1252ae5d40f7c9fd7d688db4c Mon Sep 17 00:00:00 2001 From: Daniel Friesen Date: Mon, 3 Jun 2013 02:13:42 -0700 Subject: [PATCH] Drop __autoload. spl_autoload_register exists in >=5.1.2, we require >=5.3.2 We no longer support hphpc and it looks like hhvm supports spl_autoload_register We've got no reason to keep using __autoload. We'll also need to exclusively use spl_autoload_register when we start using composer.json stuff. Change-Id: I694b7b96825e5d136fa76461511efc9a002149fa --- includes/AutoLoader.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index e92b67d9db..2decd58b06 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -1169,12 +1169,4 @@ class AutoLoader { } } -if ( function_exists( 'spl_autoload_register' ) ) { - spl_autoload_register( array( 'AutoLoader', 'autoload' ) ); -} else { - function __autoload( $class ) { - AutoLoader::autoload( $class ); - } - - ini_set( 'unserialize_callback_func', '__autoload' ); -} +spl_autoload_register( array( 'AutoLoader', 'autoload' ) ); -- 2.20.1