php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login
Return to Bug #52339
Patch spl_autoload.patch revision 2010-07-14 19:32 UTC by dangerous dot ben at gmail dot com

Patch spl_autoload.patch for SPL related Bug #52339

Patch version 2010-07-14 19:32 UTC

Return to Bug #52339 | Download this patch
Patch Revisions:

Developer: dangerous.ben@gmail.com

Index: ext/spl/php_spl.c
===================================================================
--- ext/spl/php_spl.c	(revision 301263)
+++ ext/spl/php_spl.c	(working copy)
@@ -321,18 +321,6 @@
 	EG(return_value_ptr_ptr) = original_return_value;
 	EG(opline_ptr) = original_opline_ptr;
 	EG(active_op_array) = original_active_op_array;
-
-	if (!found && !SPL_G(autoload_running)) {
-		/* For internal errors, we generate E_ERROR, for direct calls an exception is thrown.
-		 * The "scope" is determined by an opcode, if it is ZEND_FETCH_CLASS we know function was called indirectly by
-		 * the Zend engine.
-		 */
-		if (active_opline->opcode != ZEND_FETCH_CLASS) {
-			zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Class %s could not be loaded", class_name);
-		} else {
-			php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s could not be loaded", class_name);
-		}
-	}
 } /* }}} */
 
 /* {{{ proto string spl_autoload_extensions([string file_extensions])
 
PHP Copyright © 2001-2024 The PHP Group
All rights reserved.
Last updated: Thu Mar 28 08:01:28 2024 UTC