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

This commit is contained in:
Penny Leach 2010-01-28 05:11:30 +00:00
parent 9d51b4c531
commit fbac726b5e
2 changed files with 2 additions and 1 deletions

View File

@ -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) {

View File

@ -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)