@@ -2399,11 +2399,11 @@ discard block |
||
2399 | 2399 | if (isset($this->snippetCache[$snip_name])) { |
2400 | 2400 | $snippetObject['name'] = $snip_name; |
2401 | 2401 | $snippetObject['content'] = $this->snippetCache[$snip_name]; |
2402 | - if (isset($this->snippetCache["{$snip_name}Props"])) { |
|
2403 | - if (!isset($this->snippetCache["{$snip_name}Props"])) { |
|
2404 | - $this->snippetCache["{$snip_name}Props"] = ''; |
|
2402 | + if (isset($this->snippetCache["{$snip_name}props"])) { |
|
2403 | + if (!isset($this->snippetCache["{$snip_name}props"])) { |
|
2404 | + $this->snippetCache["{$snip_name}props"] = ''; |
|
2405 | 2405 | } |
2406 | - $snippetObject['properties'] = $this->snippetCache["{$snip_name}Props"]; |
|
2406 | + $snippetObject['properties'] = $this->snippetCache["{$snip_name}props"]; |
|
2407 | 2407 | } |
2408 | 2408 | } elseif (substr($snip_name, 0, 1) === '@' && isset($this->pluginEvent[trim($snip_name, '@')])) { |
2409 | 2409 | $snippetObject['name'] = trim($snip_name, '@'); |
@@ -2429,7 +2429,7 @@ discard block |
||
2429 | 2429 | $snippetObject['content'] = $snip_content; |
2430 | 2430 | $snippetObject['properties'] = $snip_prop; |
2431 | 2431 | $this->snippetCache[$snip_name] = $snip_content; |
2432 | - $this->snippetCache["{$snip_name}Props"] = $snip_prop; |
|
2432 | + $this->snippetCache["{$snip_name}props"] = $snip_prop; |
|
2433 | 2433 | } |
2434 | 2434 | |
2435 | 2435 | return $snippetObject; |
@@ -3774,7 +3774,7 @@ discard block |
||
3774 | 3774 | } |
3775 | 3775 | // build query |
3776 | 3776 | $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
3777 | - $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc |
|
3777 | + $result = $this->db->select("distinct {$fields}", "{$tblsc} sc |
|
3778 | 3778 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id", |
3779 | 3779 | "{$sort} {$dir}"); |
3780 | 3780 | $resourceArray = $this->db->makeArray($result); |
@@ -3817,7 +3817,7 @@ discard block |
||
3817 | 3817 | } |
3818 | 3818 | // build query |
3819 | 3819 | $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
3820 | - $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc |
|
3820 | + $result = $this->db->select("distinct {$fields}", "{$tblsc} sc |
|
3821 | 3821 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", |
3822 | 3822 | "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}"); |
3823 | 3823 | $resourceArray = $this->db->makeArray($result); |
@@ -3882,7 +3882,7 @@ discard block |
||
3882 | 3882 | $tblsc = $this->getFullTableName('site_content'); |
3883 | 3883 | $tbldg = $this->getFullTableName('document_groups'); |
3884 | 3884 | |
3885 | - $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc |
|
3885 | + $result = $this->db->select("distinct {$fields}", "{$tblsc} sc |
|
3886 | 3886 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", |
3887 | 3887 | "sc.parent = '{$parentid}' {$published} {$deleted} {$where} AND ({$access}) GROUP BY sc.id", |
3888 | 3888 | ($sort ? "{$sort} {$dir}" : ""), $limit); |
@@ -3959,7 +3959,7 @@ discard block |
||
3959 | 3959 | $tblsc = $this->getFullTableName('site_content'); |
3960 | 3960 | $tbldg = $this->getFullTableName('document_groups'); |
3961 | 3961 | |
3962 | - $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc |
|
3962 | + $result = $this->db->select("distinct {$fields}", "{$tblsc} sc |
|
3963 | 3963 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',', |
3964 | 3964 | $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", |
3965 | 3965 | ($sort ? "{$sort} {$dir}" : ""), $limit); |
@@ -4561,7 +4561,7 @@ discard block |
||
4561 | 4561 | $template = $doc['content']; |
4562 | 4562 | break; |
4563 | 4563 | case 'SELECT': |
4564 | - $this->db->getValue($this->db->query("SELECT {$template}")); |
|
4564 | + $this->db->getValue($this->db->query("select {$template}")); |
|
4565 | 4565 | break; |
4566 | 4566 | default: |
4567 | 4567 | if (!($template = $this->getChunk($tpl))) { |