Merge branch 'hotfix/0.5.2'

2011-03-01 11:41:59 -05:00
parent 6eb3ea0c8b 392b0a3c57
commit 27bed8f10a
1 changed files with 1 additions and 1 deletions
@@ -719,7 +719,7 @@ class Mustache {
 				} else if (isset($view->$tag_name)) {
 					return $view->$tag_name;
 				}
-			} else if (array_key_exists($tag_name, $view)) {
+			} else if (is_array($view) && array_key_exists($tag_name, $view)) {
 				return $view[$tag_name];
 			}
 		}