From b48f460a635e3e606146dc8c5186746d4fb3a421 Mon Sep 17 00:00:00 2001
From: "monte.ohrt" <monte.ohrt@localhost>
Date: Sun, 1 Nov 2009 16:26:06 +0000
Subject: [PATCH] fix spl_autoload when autoloaders exist

---
 libs/Smarty.class.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 95b0ca5d..970ff03f 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -87,12 +87,13 @@ define('SMARTY_PHP_ALLOW', 3); //-> escape tags as entities
 /**
 * register the class autoloader
 */
+spl_autoload_extensions('.php,.inc');
 if (set_include_path(SMARTY_SYSPLUGINS_DIR . PATH_SEPARATOR . get_include_path()) !== false) {
-    spl_autoload_extensions('.php,.inc');
-    $registeredAutoLoadFunctions = spl_autoload_functions();
-    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
-        spl_autoload_register();
-    } 
+    $spl_funcs = spl_autoload_functions();
+    if($spl_funcs === false)
+      spl_autoload_register();
+    elseif(!in_array('spl_autoload',$spl_funcs))
+      spl_autoload_register('spl_autoload');
 } else {
     spl_autoload_register('smartyAutoload');
 }