[geeklog-hg] geeklog: Merged with HEAD

[geeklog-cvs at lists.geeklog.net]

changeset 9424:937f11e49ef6
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/937f11e49ef6
user: Kenji ITO <mystralkk at gmail.com>
date: Mon Jan 13 09:17:11 2014 +0900
description:
Merged with HEAD

diffstat:

 public_html/lib-common.php |  3 ++-
 system/lib-topic.php       |  4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 7ddd4998dc45 -r 937f11e49ef6 public_html/lib-common.php
--- a/public_html/lib-common.php	Mon Jan 13 09:16:07 2014 +0900
+++ b/public_html/lib-common.php	Mon Jan 13 09:17:11 2014 +0900
@@ -2327,7 +2327,8 @@
 
     if( !empty( $helpfile )) {
         // Only works when header generated all at once
-        if ($_CONF['supported_version_theme'] != '1.8.1') {
+        // Make sure not a full link. Needs to follow help file format (correct location and divs)  
+        if ($_CONF['supported_version_theme'] != '1.8.1' AND !stristr( $helpfile, 'http://')) {
             // Only need to set it once
             if (! defined('GL-HELP-SET')) {
                 define('GL-HELP-SET', true);
diff -r 7ddd4998dc45 -r 937f11e49ef6 system/lib-topic.php
--- a/system/lib-topic.php	Mon Jan 13 09:16:07 2014 +0900
+++ b/system/lib-topic.php	Mon Jan 13 09:17:11 2014 +0900
@@ -1509,9 +1509,9 @@
         $topicrelated->set_file( array(
             'topicrelated' => 'topicrelated.thtml'
             ));
-        $blocks = array('topic', 'separator');
+        $blocks = array('topicitem', 'separator');
         foreach ($blocks as $block) {
-            $topicrelated->set_block('menunavigation', $block);
+            $topicrelated->set_block('topicrelated', $block);
         }             
         
         $topicrelated->set_var('lang_filed_under', $LANG27['filed_under:']);