Переглянути джерело

ZF-11466
Zend_Tool
Zend_Tool_Project_Provider_Controller checks for existing controller before canonicalizing name
(Backed out and re-committed due to typo in issue tracker ID)


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24134 44c647ce-9c0f-0410-b52a-842ac1e357ba

adamlundrigan 14 роки тому
батько
коміт
d6a7bd1abf
1 змінених файлів з 3 додано та 3 видалено
  1. 3 3
      library/Zend/Tool/Project/Provider/Controller.php

+ 3 - 3
library/Zend/Tool/Project/Provider/Controller.php

@@ -128,9 +128,6 @@ class Zend_Tool_Project_Provider_Controller
                 );
         }
         
-        $originalName = $name;
-        $name = ucfirst($name);
-        
         if (self::hasResource($this->_loadedProfile, $name, $module)) {
             throw new Zend_Tool_Project_Provider_Exception('This project already has a controller named ' . $name);
         }
@@ -140,6 +137,9 @@ class Zend_Tool_Project_Provider_Controller
             throw new Zend_Tool_Project_Provider_Exception('Controller names should be camel cased.');
         }
 
+        $originalName = $name;
+        $name = ucfirst($name);
+
         try {
             $controllerResource = self::createResource($this->_loadedProfile, $name, $module);
             if ($indexActionIncluded) {