Merge branch 'dev' into feature/implicit-iterator

2010-07-11 22:35:38 -04:00
parent 0256d03b5f 870aedf6b9
commit 6cfd2b4be8
12 changed files with 185 additions and 14 deletions
@@ -615,7 +615,7 @@ class Mustache {
 	 * @return bool
 	 */
 	protected function _varIsIterable($var) {
-		return is_object($var) || (is_array($var) && !array_diff_key($var, array_keys(array_keys($var))));
+		return $var instanceof Traversable || (is_array($var) && !array_diff_key($var, array_keys(array_keys($var))));
 	}
 }