Merge pull request #2470 from sunnysideup/patch-19

more meaningful error message in ConfigStaticManifest.php (depth < 0)
This commit is contained in:
Hamish Friedlander 2013-11-04 17:58:10 -08:00
commit e161439340

View File

@ -237,7 +237,7 @@ class SS_ConfigStaticManifest_Parser {
else if($type == '}') { else if($type == '}') {
$depth -= 1; $depth -= 1;
if($depth < $clsdepth) $class = $clsdepth = null; if($depth < $clsdepth) $class = $clsdepth = null;
if($depth < 0) user_error("Hmm - depth calc wrong, hit negatives", E_USER_ERROR); if($depth < 0) user_error("Hmm - depth calc wrong, hit negatives, see: ".$this->path, E_USER_ERROR);
} }
else if($type == T_PUBLIC || $type == T_PRIVATE || $type == T_PROTECTED) { else if($type == T_PUBLIC || $type == T_PRIVATE || $type == T_PROTECTED) {
$access = $type; $access = $type;