oreolek/batufa
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Optimized regex in arr::callback(). Also fixed a bug: $params should be "0" and not NULL with a callback string like "foo[0]".

Browse source
This commit is contained in:
Geert De Deckere 2009-05-30 12:23:39 +02:00
parent 2ddcd9d83f
commit 447703a966
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
system/classes/arr.php
View file

@ -108,6 +108,7 @@ class arr_core {
/**
* Creates a callable function and parameter list from a string representation.
* Note that this function does not validate the callback string.
*
* // Get the callback function and parameters
* list($func, $params) = arr::callback('foo::bar[apple,orange]');
@ -124,12 +125,12 @@ class arr_core {
$command = $params = NULL;
// command[param,param]
if (preg_match('/([^\[]*+)\[(.*)\]/', $str, $match))
if (preg_match('/^([^\[]*+)\[(.*)\]$/', $str, $match))
{
// command
$command = $match[1];
if ( ! empty($match[2]))
if ($match[2] !== '')
{
// param,param
$params = preg_split('/(?<!\\\\),/', $match[2]);
@ -151,4 +152,4 @@ class arr_core {
return array($command, $params);
}
} // End arr
} // End arr