Merge branch 'hotfix/3362' into develop

Forward port zendframework/zendframework#3362 Conflicts: library/Zend/Http/Client/Cookies.php library/Zend/Http/Cookies.php library/Zend/Soap/Client/Common.php library/Zend/Soap/Wsdl.php
zendframework · Jan 7, 2013 · 0b9b10b · 0b9b10b
commit 0b9b10b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/ModuleAutoloader.php b/src/ModuleAutoloader.php
@@ -160,8 +160,8 @@ public function autoload($class)
                     continue;
                 }
 
-                $moduleName_buffer = str_replace($namespace . "\\", "", $moduleName );
-                $path .= DIRECTORY_SEPARATOR . $moduleName_buffer . DIRECTORY_SEPARATOR;
+                $moduleNameBuffer = str_replace($namespace . "\\", "", $moduleName );
+                $path .= DIRECTORY_SEPARATOR . $moduleNameBuffer . DIRECTORY_SEPARATOR;
 
                 $classLoaded = $this->loadModuleFromDir($path, $class);
                 if ($classLoaded) {