From 31fb525e0cd4d54c5132fea4803f2dca99949612 Mon Sep 17 00:00:00 2001
From: Deesen <dh@fuseit.de>
Date: Tue, 1 Nov 2016 18:45:37 +0100
Subject: [PATCH] Fix #890

---
 manager/includes/tmplvars.commands.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manager/includes/tmplvars.commands.inc.php b/manager/includes/tmplvars.commands.inc.php
index e139e1b628..364c5d07e8 100755
--- a/manager/includes/tmplvars.commands.inc.php
+++ b/manager/includes/tmplvars.commands.inc.php
@@ -147,7 +147,7 @@ function ParseCommand($binding_string)
 function parseTvValues($param, $tvsArray)
 {
 	global $modx;
-	$tvsArray = array_merge($tvsArray, $modx->documentObject);
+	$tvsArray = is_array($modx->documentObject) ? array_merge($tvsArray, $modx->documentObject) : $tvsArray;
 	if (strpos($param, '[*') !== false) {
 		$matches = $modx->getTagsFromContent($param, '[*', '*]');
 		foreach ($matches[0] as $i=>$match) {