tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed 'undefined offset 10' error

Browse Source
This commit is contained in:
AngryPHPNerd 2012-02-27 22:59:19 +01:00
parent 0e2cbb0b88
commit 8c075dab9c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
i18n/i18nTextCollector.php
View File

@ -300,9 +300,9 @@ class i18nTextCollector extends Object {
if(strpos('$', $entity) !== FALSE) return false; if(strpos('$', $entity) !== FALSE) return false;
// remove wrapping quotes // remove wrapping quotes
$value = ($regs[2]) ? substr($regs[2],1,-1) : null; $value = !empty($regs[2]) ? substr($regs[2],1,-1) : null;
$value = preg_replace("/([^\\])['\"][[:space:]]*\.[[:space:]]*['\"]/", '\\1', $value); $value = preg_replace("#([^\\\\])['\"][[:space:]]*\.[[:space:]]*['\"]#", '\\1', $value);
// only escape quotes when wrapped in double quotes, to make them safe for insertion // only escape quotes when wrapped in double quotes, to make them safe for insertion
// into single-quoted PHP code. If they're wrapped in single quotes, the string should // into single-quoted PHP code. If they're wrapped in single quotes, the string should
@ -314,13 +314,12 @@ class i18nTextCollector extends Object {
$value = str_replace("'","\\'", $value); $value = str_replace("'","\\'", $value);
} }
// remove starting comma and any newlines // remove starting comma and any newlines
$eol = PHP_EOL; $eol = PHP_EOL;
$prio = ($regs[10]) ? trim(preg_replace("/$eol/", '', substr($regs[10],1))) : null; $prio = !empty($regs[10]) ? trim(preg_replace("/$eol/", '', substr($regs[10],1))) : null;
// remove wrapping quotes // remove wrapping quotes
$comment = ($regs[12]) ? substr($regs[12],1,-1) : null; $comment = !empty($regs[12]) ? substr($regs[12],1,-1) : null;
return array( return array(
"{$namespace}.{$entity}" => array( "{$namespace}.{$entity}" => array(