|
@@ 4860-4864 (lines=5) @@
|
| 4857 |
|
if ($tvsort != '') { |
| 4858 |
|
$tvsort = 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort)))); |
| 4859 |
|
} |
| 4860 |
|
if ($tvidnames == "*") { |
| 4861 |
|
$query = "tv.id<>0"; |
| 4862 |
|
} else { |
| 4863 |
|
$query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name") . " IN ('" . implode("','", $tvidnames) . "')"; |
| 4864 |
|
} |
| 4865 |
|
|
| 4866 |
|
$this->getUserDocGroups(); |
| 4867 |
|
|
|
@@ 5037-5041 (lines=5) @@
|
| 5034 |
|
$fields = ($fields == '') ? 'tv.*' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $fields)))); |
| 5035 |
|
$sort = ($sort == '') ? '' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $sort)))); |
| 5036 |
|
|
| 5037 |
|
if ($idnames == '*') { |
| 5038 |
|
$query = 'tv.id<>0'; |
| 5039 |
|
} else { |
| 5040 |
|
$query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name') . " IN ('" . implode("','", $idnames) . "')"; |
| 5041 |
|
} |
| 5042 |
|
|
| 5043 |
|
$rs = $this->getDatabase()->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getDatabase()->getFullTableName('site_tmplvars') . " tv |
| 5044 |
|
INNER JOIN " . $this->getDatabase()->getFullTableName('site_tmplvar_templates') . " tvtpl ON tvtpl.tmplvarid = tv.id |