From d41111a065e532f3f65e4eee7fed189ef949ade3 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 14 Dec 2012 12:16:27 -0500
Subject: [PATCH] Fixed: Sorting as client can lead to sql errors due to amigious column sys_userid (JOINs)
---
interface/lib/classes/tools_sites.inc.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/tools_sites.inc.php b/interface/lib/classes/tools_sites.inc.php
index 403f323..c501173 100644
--- a/interface/lib/classes/tools_sites.inc.php
+++ b/interface/lib/classes/tools_sites.inc.php
@@ -58,8 +58,8 @@
function removePrefix($name, $currentPrefix, $globalPrefix) {
if($name == "") return "";
- if($currentPrefix == '#') return $name; // # = empty prefix, do not change name
- if($currentPrefix === '') $currentPrefix = $globalPrefix; // entry has no prefix set, maybe it was created before this function was introduced
+ if($currentPrefix === '') return $name; // empty prefix, do not change name
+ if($currentPrefix === '#') $currentPrefix = $globalPrefix; // entry has no prefix set, maybe it was created before this function was introduced
if($currentPrefix === '') return $name; // no current prefix and global prefix is empty -> nothing to remove here.
@@ -69,7 +69,7 @@
function getPrefix($currentPrefix, $userPrefix, $adminPrefix = false) {
global $app;
- if($currentPrefix !== '') return ($currentPrefix == '#' ? '' : $currentPrefix); // return the currently set prefix for this entry (# = empty)
+ if($currentPrefix !== '#') return $currentPrefix; // return the currently set prefix for this entry (# = no prefix set yet)
if($adminPrefix === false) $adminPrefix = $userPrefix;
--
Gitblit v1.9.1