From 2bf6a7e2de367ec3da4dea0e04a1b548d7590e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 14 Aug 2012 09:00:06 +0000 Subject: [PATCH] =?UTF-8?q?Wenn=20der=20Content=20in=20der=20Sprache=20nic?= =?UTF-8?q?ht=20vorhanden=20ist,=20wird=20im=20Men=C3=BC=20die=20Defaultsp?= =?UTF-8?q?rache=20angezeigt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/content.class.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/content.class.php b/include/content.class.php index 282b11e86..f3789bc3e 100644 --- a/include/content.class.php +++ b/include/content.class.php @@ -1368,13 +1368,18 @@ class content extends basis_db JOIN campus.tbl_contentsprache USING(content_id) WHERE tbl_content.content_id=".$this->db_add_param($id, FHC_INTEGER)." - AND tbl_contentsprache.sprache=".$this->db_add_param($sprache); + AND (tbl_contentsprache.sprache=".$this->db_add_param($sprache)." + OR (tbl_contentsprache.sprache=".$this->db_add_param(DEFAULT_LANGUAGE)." AND + NOT EXISTS(SELECT * FROM campus.tbl_contentsprache + WHERE + content_id=".$this->db_add_param($id, FHC_INTEGER)." + AND sprache=".$this->db_add_param($sprache).")))"; if($sichtbar) $qry.=" AND sichtbar=true"; //Hoechste (sichtbare) Version $qry.=" AND version=(SELECT max(version) FROM campus.tbl_contentsprache - WHERE content_id=".$this->db_add_param($id, FHC_INTEGER)." - AND tbl_contentsprache.sprache=".$this->db_add_param($sprache); + WHERE content_id=".$this->db_add_param($id, FHC_INTEGER); + //." AND tbl_contentsprache.sprache=".$this->db_add_param($sprache); if($sichtbar) $qry.=" AND sichtbar=true"; $qry.=")";