[geeklog-hg] geeklog: Fixed Topics not assigned to a language not displaying ...

[geeklog-cvs at lists.geeklog.net]

changeset 9183:fea8b0e37167
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/fea8b0e37167
user: Tom <websitemaster at cogeco.net>
date: Sat Jul 13 12:16:48 2013 -0400
description:
Fixed Topics not assigned to a language not displaying in Geeklog multilanguage setups (bug #0001620)

diffstat:

 public_html/lib-common.php |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (15 lines):

diff -r 40860ec1da4b -r fea8b0e37167 public_html/lib-common.php
--- a/public_html/lib-common.php	Thu Jul 11 19:34:14 2013 -0400
+++ b/public_html/lib-common.php	Sat Jul 13 12:16:48 2013 -0400
@@ -2952,9 +2952,8 @@
         }
         
         if ($branch_level_skip == 0) {
-            // Make sure to show topics for proper language only
-            // if ($_TOPICS[$count_topic]['exclude'] == 0 && $_TOPICS[$count_topic]['access'] > 0 && !$_TOPICS[$count_topic]['hidden'] && (($lang_id == '') || ($lang_id != '' && ($_TOPICS[$count_topic]['language_id'] == $lang_id)))) {
-            if ($_TOPICS[$count_topic]['exclude'] == 0 && $_TOPICS[$count_topic]['access'] > 0 && (($lang_id == '') || ($lang_id != '' && ($_TOPICS[$count_topic]['language_id'] == $lang_id)))) {
+            // Make sure to show topics for proper language only (and all languages)
+            if ($_TOPICS[$count_topic]['exclude'] == 0 && $_TOPICS[$count_topic]['access'] > 0 && (($lang_id == '') || ($lang_id != '' && ($_TOPICS[$count_topic]['language_id'] == $lang_id || $_TOPICS[$count_topic]['language_id'] == '')))) {
                 $continue = false;
                 if ($_TOPICS[$count_topic]['parent_id'] == $topic) {
                     // Make sure to list any hidden child topics else skip