Merge pull request #192 from Segr/develop

Big fix
modxcms · Feb 27, 2014 · b3fa67c · b3fa67c
2 parents e0dfb90 + bb8a1a7
commit b3fa67c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/assets/plugins/managermanager/modx.ddtools.class.php b/assets/plugins/managermanager/modx.ddtools.class.php
@@ -486,7 +486,6 @@ public static function getDocuments($ids = array(), $published = false, $deleted
 		if (count($ids) == 0){
 			return false;
 		}else{
-			$limit = ($limit != "") ? "LIMIT $limit" : ""; // LIMIT capabilities - rad14701
 			// modify field names to use sc. table reference
 			$fields = 'sc.' . implode(',sc.', preg_replace("/^\s/i", "", explode(',', $fields)));
 			$sort = ($sort == "") ? "" : 'sc.' . implode(',sc.', preg_replace("/^\s/i", "", explode(',', $sort)));

diff --git a/manager/actions/mutate_module_resources.dynamic.php b/manager/actions/mutate_module_resources.dynamic.php
@@ -63,7 +63,7 @@
 		break;
 	case 'del':
 		// convert ids to numbers
-		$opids = array_filter(array_map('intval', explode(',', $_REQUEST['depid']));
+		$opids = array_filter(array_map('intval', $_REQUEST['depid']));
 
 		// get resources that needs to be removed
 		$ds = $modx->db->select('*', $tbl_site_module_depobj, "id IN (".implode(",",$opids).")");

diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php
@@ -2766,8 +2766,8 @@ function getTemplateVars($idnames = array(), $fields = '*', $docid = '', $publis
 				"{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value",
 				$this->getFullTableName('site_tmplvars') . " tv
 					INNER JOIN " . $this->getFullTableName('site_tmplvar_templates') . " tvtpl ON tvtpl.tmplvarid = tv.id
-					LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues') . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'
-				    {$query} AND tvtpl.templateid = '{$docRow['template']}'",
+					LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues') . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'",
+				"{$query} AND tvtpl.templateid = '{$docRow['template']}'",
 				($sort ? "{$sort} {$dir}" : "")
 				);
 
@@ -3041,7 +3041,6 @@ function getWebUserInfo($uid) {
                 INNER JOIN " . $this->getFullTableName("web_user_attributes") . " wua ON wua.internalkey=wu.id",
             "wu.id='{$uid}'"
             );
-        $rs= $this->db->query($sql);
         if ($row = $this->db->getRow($rs)) {
             if (!$row["usertype"])
                 $row["usertype"]= "web";

diff --git a/manager/processors/delete_eventlog.processor.php b/manager/processors/delete_eventlog.processor.php
@@ -4,13 +4,16 @@
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+if (isset($_GET['cls']) && $_GET['cls']==1) {
+	$where = '';
+} else {
+	$id = isset($_GET['id'])? intval($_GET['id']) : 0;
+	if($id==0) {
+		$modx->webAlertAndQuit($_lang["error_no_id"]);
+	}
+	$where = "id='{$id}'";
 }
 
-$where = (isset($_GET['cls']) && $_GET['cls']==1) ? '' : "id='{$id}'";
-
 // delete event log
 $modx->db->delete($modx->getFullTableName('event_log'), $where);