add change from modx evolution develop branch

Dmi3yy · Oct 24, 2014 · 1f46db1 · 1f46db1
1 parent c9e0628
commit 1f46db1
Show file tree

Hide file tree

Showing 63 changed files with 594 additions and 1,550 deletions.
diff --git a/assets/modules/docmanager/tv.ajax.php b/assets/modules/docmanager/tv.ajax.php
@@ -281,7 +281,7 @@ function ParseIntputOptions($v) {
         global $modx;
 	$a = array();
 	if(is_array($v)) return $v;
-	else if(is_resource($v)) {
+	else if($modx->db->isResult($v)) {
 		$a = $modx->db->makeArray($v);
 	}
 	else $a = explode("||", $v);

diff --git a/assets/plugins/managermanager/docs/changelog.htm b/assets/plugins/managermanager/docs/changelog.htm