From ea940fcd0df12dddf7a3d8b7756596d33f695c34 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 26 Feb 2008 03:14:27 +0000 Subject: [PATCH] Exclude subsites without titles from site lists --- code/Subsite.php | 2 +- code/SubsiteAdmin.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/Subsite.php b/code/Subsite.php index 7f59310..f26b56a 100644 --- a/code/Subsite.php +++ b/code/Subsite.php @@ -300,7 +300,7 @@ SQL; if(!$member) return new DataObjectSet(); $subsites = DataObject::get('Subsite', - "`Group_Members`.`MemberID` = $member->ID AND `Permission`.`Code` IN ($SQL_codes, 'ADMIN') AND `Subsite`.Title != ''", '', + "`Group_Members`.`MemberID` = $member->ID AND `Permission`.`Code` IN ($SQL_codes, 'ADMIN') AND Subdomain IS NOT NULL AND `Subsite`.Title != ''", '', "LEFT JOIN `Group` ON (`SubsiteID`=`Subsite`.`ID` OR `SubsiteID` = 0) LEFT JOIN `Group_Members` ON `Group_Members`.`GroupID`=`Group`.`ID` LEFT JOIN `Permission` ON `Group`.`ID`=`Permission`.`GroupID`"); diff --git a/code/SubsiteAdmin.php b/code/SubsiteAdmin.php index 36dcfcc..c32a9f7 100644 --- a/code/SubsiteAdmin.php +++ b/code/SubsiteAdmin.php @@ -28,6 +28,8 @@ class SubsiteAdmin extends GenericDataAdmin { if(isset($data['Name']) && $data['Name']) { $SQL_name = Convert::raw2sql($data['Name']); $where = "`Title` LIKE '%$SQL_name%'"; + } else { + $where = "`Title` != ''"; } $intranets = DataObject::get('Subsite', $where, "if(ClassName = 'Subsite_Template',0,1), Title");