MDL-21461 Temporary fix for ZF-6996 until Zend 1.10 is released

roddle · Jan 28, 2010 · fbac726 · fbac726
1 parent 9d51b4c
commit fbac726
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/zend/Zend/Server/Reflection/Function/Abstract.php b/lib/zend/Zend/Server/Reflection/Function/Abstract.php
@@ -293,7 +293,7 @@ protected function _reflect()
             // Get param types and description
             if (preg_match_all('/@param\s+([^\s]+)/m', $docBlock, $matches)) {
                 $paramTypesTmp = $matches[1];
-                if (preg_match_all('/@param\s+\S+\s+(\$^\S+)\s+(.*?)(@|\*\/)/s', $docBlock, $matches))
+                if (preg_match_all('/@param\s+\S+\s+(\$\S+)\s+(.*?)(@|\*\/)/s', $docBlock, $matches))
                 {
                     $paramDesc = $matches[2];
                     foreach ($paramDesc as $key => $value) {

diff --git a/lib/zend/readme_moodle.txt b/lib/zend/readme_moodle.txt
@@ -7,4 +7,5 @@ Do not use outside of our /webservice/* !!
 Changes:
 * lots of files removed
 * small fix to error reporting in reflection (MDL-21460, ZF-8980)
+* regular expression fix in reflection (committed upstream, will be in 1.10) (MDL-21461, ZF-6996)