Merge branch 'dev' into feature/test-coverage

This commit is contained in:
Justin Hileman
2010-05-27 16:12:02 -04:00
+4 -4
View File
@@ -470,8 +470,8 @@ class Mustache {
* Push a local context onto the stack. * Push a local context onto the stack.
* *
* @access protected * @access protected
* @param array $local_context * @param array &$local_context
* @return array * @return void
*/ */
protected function _pushContext(&$local_context) { protected function _pushContext(&$local_context) {
$new = array(); $new = array();
@@ -537,11 +537,11 @@ class Mustache {
* *
* @access protected * @access protected
* @param string $tag_name * @param string $tag_name
* @param array &$context * @param array $context
* @throws MustacheException Unknown variable name. * @throws MustacheException Unknown variable name.
* @return string * @return string
*/ */
protected function _findVariableInContext($tag_name, &$context) { protected function _findVariableInContext($tag_name, $context) {
foreach ($context as $view) { foreach ($context as $view) {
if (is_object($view)) { if (is_object($view)) {
if (isset($view->$tag_name)) { if (isset($view->$tag_name)) {