Merge branch 'master' into 2.5

This commit is contained in:
mark_story 2014-04-10 20:51:49 -04:00
commit bf9c3029cb
4 changed files with 50 additions and 7 deletions

View file

@ -204,7 +204,13 @@ class Hash {
return false;
}
$prop = isset($data[$attr]) ? $data[$attr] : null;
$prop = null;
if (isset($data[$attr])) {
$prop = $data[$attr];
}
if ($prop === true || $prop === false) {
$prop = $prop ? 'true' : 'false';
}
// Pattern matches and other operators.
if ($op === '=' && $val && $val[0] === '/') {