From fbac726b5e0af871f7f98e6c2d7487274fe44923 Mon Sep 17 00:00:00 2001 From: Penny Leach Date: Thu, 28 Jan 2010 05:11:30 +0000 Subject: [PATCH] MDL-21461 Temporary fix for ZF-6996 until Zend 1.10 is released --- lib/zend/Zend/Server/Reflection/Function/Abstract.php | 2 +- lib/zend/readme_moodle.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/zend/Zend/Server/Reflection/Function/Abstract.php b/lib/zend/Zend/Server/Reflection/Function/Abstract.php index e1ea822b0ad..e9422e6a576 100644 --- a/lib/zend/Zend/Server/Reflection/Function/Abstract.php +++ b/lib/zend/Zend/Server/Reflection/Function/Abstract.php @@ -293,7 +293,7 @@ abstract class Zend_Server_Reflection_Function_Abstract // 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 index 68b955b9aa4..5511b306c1b 100644 --- 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)