@@ -2593,11 +2593,11 @@ discard block |
||
| 2593 | 2593 | if (isset($this->snippetCache[$snip_name])) { |
| 2594 | 2594 | $snippetObject['name'] = $snip_name; |
| 2595 | 2595 | $snippetObject['content'] = $this->snippetCache[$snip_name]; |
| 2596 | - if (isset($this->snippetCache["{$snip_name}Props"])) { |
|
| 2597 | - if (!isset($this->snippetCache["{$snip_name}Props"])) { |
|
| 2598 | - $this->snippetCache["{$snip_name}Props"] = ''; |
|
| 2596 | + if (isset($this->snippetCache["{$snip_name}props"])) { |
|
| 2597 | + if (!isset($this->snippetCache["{$snip_name}props"])) { |
|
| 2598 | + $this->snippetCache["{$snip_name}props"] = ''; |
|
| 2599 | 2599 | } |
| 2600 | - $snippetObject['properties'] = $this->snippetCache["{$snip_name}Props"]; |
|
| 2600 | + $snippetObject['properties'] = $this->snippetCache["{$snip_name}props"]; |
|
| 2601 | 2601 | } |
| 2602 | 2602 | } elseif (substr($snip_name, 0, 1) === '@' && isset($this->pluginEvent[trim($snip_name, '@')])) { |
| 2603 | 2603 | $snippetObject['name'] = trim($snip_name, '@'); |
@@ -2622,7 +2622,7 @@ discard block |
||
| 2622 | 2622 | $snippetObject['content'] = $snip_content; |
| 2623 | 2623 | $snippetObject['properties'] = $snip_prop; |
| 2624 | 2624 | $this->snippetCache[$snip_name] = $snip_content; |
| 2625 | - $this->snippetCache["{$snip_name}Props"] = $snip_prop; |
|
| 2625 | + $this->snippetCache["{$snip_name}props"] = $snip_prop; |
|
| 2626 | 2626 | } |
| 2627 | 2627 | return $snippetObject; |
| 2628 | 2628 | } |
@@ -3933,7 +3933,7 @@ discard block |
||
| 3933 | 3933 | } |
| 3934 | 3934 | // build query |
| 3935 | 3935 | $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
| 3936 | - $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc |
|
| 3936 | + $result = $this->getDatabase()->select("distinct {$fields}", "{$tblsc} sc |
|
| 3937 | 3937 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}"); |
| 3938 | 3938 | $resourceArray = $this->getDatabase()->makeArray($result); |
| 3939 | 3939 | $this->tmpCache[__FUNCTION__][$cacheKey] = $resourceArray; |
@@ -3970,7 +3970,7 @@ discard block |
||
| 3970 | 3970 | } |
| 3971 | 3971 | // build query |
| 3972 | 3972 | $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
| 3973 | - $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc |
|
| 3973 | + $result = $this->getDatabase()->select("distinct {$fields}", "{$tblsc} sc |
|
| 3974 | 3974 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}"); |
| 3975 | 3975 | $resourceArray = $this->getDatabase()->makeArray($result); |
| 3976 | 3976 | |
@@ -4026,7 +4026,7 @@ discard block |
||
| 4026 | 4026 | $tblsc = $this->getFullTableName('site_content'); |
| 4027 | 4027 | $tbldg = $this->getFullTableName('document_groups'); |
| 4028 | 4028 | |
| 4029 | - $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc |
|
| 4029 | + $result = $this->getDatabase()->select("distinct {$fields}", "{$tblsc} sc |
|
| 4030 | 4030 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$parentid}' {$published} {$deleted} {$where} AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit); |
| 4031 | 4031 | |
| 4032 | 4032 | $resourceArray = $this->getDatabase()->makeArray($result); |
@@ -4092,7 +4092,7 @@ discard block |
||
| 4092 | 4092 | $tblsc = $this->getFullTableName('site_content'); |
| 4093 | 4093 | $tbldg = $this->getFullTableName('document_groups'); |
| 4094 | 4094 | |
| 4095 | - $result = $this->getDatabase()->select("DISTINCT {$fields}", "{$tblsc} sc |
|
| 4095 | + $result = $this->getDatabase()->select("distinct {$fields}", "{$tblsc} sc |
|
| 4096 | 4096 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',', $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit); |
| 4097 | 4097 | |
| 4098 | 4098 | $resourceArray = $this->getDatabase()->makeArray($result); |
@@ -4679,7 +4679,7 @@ discard block |
||
| 4679 | 4679 | $template = $doc['content']; |
| 4680 | 4680 | break; |
| 4681 | 4681 | case 'SELECT': |
| 4682 | - $this->getDatabase()->getValue($this->getDatabase()->query("SELECT {$template}")); |
|
| 4682 | + $this->getDatabase()->getValue($this->getDatabase()->query("select {$template}")); |
|
| 4683 | 4683 | break; |
| 4684 | 4684 | default: |
| 4685 | 4685 | if (!($template = $this->getChunk($tpl))) { |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | cm.style.visibility = 'hidden'; |
| 70 | 70 | } |
| 71 | 71 | </script> |
| 72 | -BLOCK; |
|
| 72 | +block; |
|
| 73 | 73 | |
| 74 | 74 | $html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>"; |
| 75 | 75 | $ContextMenuScript = ""; // reset css |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | $modx->setPlaceholder($rvKey, $rvValue); |
| 52 | 52 | } |
| 53 | 53 | $param = $modx->mergePlaceholderContent($param); |
| 54 | - $rs = $modx->getDatabase()->query("SELECT $param;"); |
|
| 54 | + $rs = $modx->getDatabase()->query("select $param;"); |
|
| 55 | 55 | $output = $rs; |
| 56 | 56 | break; |
| 57 | 57 | |
@@ -376,10 +376,10 @@ |
||
| 376 | 376 | if ($properties = $modx->getDatabase()->getValue($res)) { |
| 377 | 377 | $properties = $modx->parseProperties($properties, 'TransAlias', 'plugin'); |
| 378 | 378 | } else { |
| 379 | - $properties = NULL; |
|
| 379 | + $properties = null; |
|
| 380 | 380 | } |
| 381 | 381 | } else { |
| 382 | - $properties = NULL; |
|
| 382 | + $properties = null; |
|
| 383 | 383 | } |
| 384 | 384 | return $properties; |
| 385 | 385 | } |