Преглед на файлове

merge r25074 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25075 44c647ce-9c0f-0410-b52a-842ac1e357ba
rob преди 13 години
родител
ревизия
2b98a98cfd
променени са 1 файла, в които са добавени 3 реда и са изтрити 5 реда
  1. 3 5
      library/Zend/Form/Element.php

+ 3 - 5
library/Zend/Form/Element.php

@@ -1072,14 +1072,12 @@ class Zend_Form_Element implements Zend_Validate_Interface
                 return $this;
             case null:
                 $nsSeparator = (false !== strpos($prefix, '\\'))?'\\':'_';
-                $prefix = rtrim($prefix, $nsSeparator);
-                $path   = rtrim($path, DIRECTORY_SEPARATOR);
+                $prefix = rtrim($prefix, $nsSeparator) . $nsSeparator;
+                $path   = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
                 foreach (array(self::DECORATOR, self::FILTER, self::VALIDATE) as $type) {
                     $cType        = ucfirst(strtolower($type));
-                    $pluginPath   = $path . DIRECTORY_SEPARATOR . $cType . DIRECTORY_SEPARATOR;
-                    $pluginPrefix = $prefix . $nsSeparator . $cType;
                     $loader       = $this->getPluginLoader($type);
-                    $loader->addPrefixPath($pluginPrefix, $pluginPath);
+                    $loader->addPrefixPath($prefix . $cType, $path . $cType . DIRECTORY_SEPARATOR);
                 }
                 return $this;
             default: