[geeklog-cvs] geeklog: Removed $_CONF['pagetitle'] hack

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d6c9bb40e6ff
changeset: 6785:d6c9bb40e6ff
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 11:55:21 2009 +0100
description:
Removed $_CONF['pagetitle'] hack

diffstat:

5 files changed, 5 insertions(+), 12 deletions(-)
plugins/staticpages/functions.inc    |    4 ++--
plugins/staticpages/services.inc.php |    3 +--
public_html/docs/history             |    2 ++
public_html/index.php                |    4 ----
public_html/lib-common.php           |    4 ----

diffs (70 lines):

diff -r c019de3f112d -r d6c9bb40e6ff plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Feb 21 10:35:01 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sat Feb 21 11:55:21 2009 +0100
@@ -273,10 +273,10 @@
     $retval = '';
 
     if ($A['sp_format'] == 'allblocks' OR $A['sp_format'] == 'leftblocks') {
-        $retval .= COM_siteHeader ('menu');
+        $retval .= COM_siteHeader('menu', $A['sp_title']);
     } else {
         if ($A['sp_format'] <> 'blankpage') {
-            $retval .= COM_siteHeader ('none');
+            $retval .= COM_siteHeader('none', $A['sp_title']);
         }
     }
     if ($msg > 0) {
diff -r c019de3f112d -r d6c9bb40e6ff plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sat Feb 21 10:35:01 2009 +0100
+++ b/plugins/staticpages/services.inc.php	Sat Feb 21 11:55:21 2009 +0100
@@ -546,9 +546,8 @@
 
         if (!($error)) {
             $output = DB_fetchArray ($result, false);
+
             // WE ASSUME $output doesn't have any confidential fields 
-
-            $_CONF['pagetitle'] = stripslashes ($output['sp_title']);
 
         } else { // an error occured (page not found, access denied, ...)
             if (empty ($page)) {
diff -r c019de3f112d -r d6c9bb40e6ff public_html/docs/history
--- a/public_html/docs/history	Sat Feb 21 10:35:01 2009 +0100
+++ b/public_html/docs/history	Sat Feb 21 11:55:21 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Removed $_CONF['pagetitle'] hack. Use COM_siteHeader('menu', $pagetitle)
+  instead [Dirk]
 - Added canonical link for articles [Dirk]
 - Moved hard-coded "Reminders" column title to the language file (bug #0000817)
 - Hide archive option radiobutton from the story editor when no archive topic
diff -r c019de3f112d -r d6c9bb40e6ff public_html/index.php
--- a/public_html/index.php	Sat Feb 21 10:35:01 2009 +0100
+++ b/public_html/index.php	Sat Feb 21 11:55:21 2009 +0100
@@ -89,10 +89,6 @@
     if ( $A = DB_fetchArray( $result ) ) {
         $pagetitle = $_CONF['microsummary_short'].$A['title'];
     } else {
-        if(isset( $_CONF['pagetitle'] ))
-        {
-            $pagetitle = $_CONF['pagetitle'];
-        }
         if( empty( $pagetitle ))
         {
             if( empty( $topic ))
diff -r c019de3f112d -r d6c9bb40e6ff public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Feb 21 10:35:01 2009 +0100
+++ b/public_html/lib-common.php	Sat Feb 21 11:55:21 2009 +0100
@@ -973,10 +973,6 @@
     // TBD: add a plugin API and a lib-custom.php function
     $header->set_var( 'rel_links', implode( LB, $relLinks ));
 
-    if( empty( $pagetitle ) && isset( $_CONF['pagetitle'] ))
-    {
-        $pagetitle = $_CONF['pagetitle'];
-    }
     if( empty( $pagetitle ))
     {
         if( empty( $topic ))