[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9155:c6405622b5bf
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c6405622b5bf
user: Tom <websitemaster at cogeco.net>
date: Mon Jul 01 11:33:04 2013 -0400
description:
Merged with upstream

diffstat:

 public_html/lib-common.php     |  19 +++++++++----------
 system/classes/story.class.php |  15 ---------------
 system/lib-admin.php           |   2 +-
 3 files changed, 10 insertions(+), 26 deletions(-)

diffs (91 lines):

diff -r 0e50c0174dce -r c6405622b5bf public_html/lib-common.php
--- a/public_html/lib-common.php	Mon Jul 01 11:32:14 2013 -0400
+++ b/public_html/lib-common.php	Mon Jul 01 11:33:04 2013 -0400
@@ -3821,12 +3821,8 @@
 */
 function COM_handleCode( $str )
 {
-
-    // note that bug fixes are included in this function (Issue #0001619)
-    // '\' -> '&#092;' -> '\'
-    // '$'  -> '&#36;'  -> '$'
-    $search  = array('&',     '&#092;', '&#36;', '\\',    '<',    '>',    '[',     ']'    );
-    $replace = array('&', '\',     '$',     '\', '<', '>', '[', ']');
+    $search  = array('&',     '<',    '>',    '[',     ']'    );
+    $replace = array('&', '<', '>', '[', ']');
 
     $str = str_replace( $search, $replace, $str );
 
@@ -3848,14 +3844,11 @@
 {
     global $_CONF, $_USER;
 
-    // replace any \ with \ (HTML equiv)
-    $str = str_replace('\\', '\', COM_stripslashes($str) );
+    $str = COM_stripslashes($str);
 
     // Get rid of any newline characters
     $str = str_replace("\n", '', $str);
 
-    // Replace any $ with $ (HTML equiv)
-    $str = str_replace( '$', '$', $str );
     // handle [code] ... [/code]
     do
     {
@@ -3918,6 +3911,12 @@
     }
     while( $start_pos !== false );
 
+    // replace any \ with \ (HTML equiv)
+    $str = str_replace( '\\', '\', $str );
+
+    // Replace any $ with $ (HTML equiv)
+    $str = str_replace( '$', '$', $str );
+
     $has_skiphtmlfilterPermissions = SEC_hasRights ('htmlfilter.skip');
     
     if ($has_skiphtmlfilterPermissions || (isset( $_CONF['skip_html_filter_for_root'] ) &&
diff -r 0e50c0174dce -r c6405622b5bf system/classes/story.class.php
--- a/system/classes/story.class.php	Mon Jul 01 11:32:14 2013 -0400
+++ b/system/classes/story.class.php	Mon Jul 01 11:33:04 2013 -0400
@@ -421,9 +421,6 @@
 
         // Store the original SID
         $this->_originalSid = $this->_sid;
-
-        // Fix incorrect strings
-        $this->_fixData();
     }
 
     /**
@@ -2222,18 +2219,6 @@
         }
     }
 
-    /**
-     * replace incorrect strings that have already been stored in the database
-     * (Issue #0001619)
-     */
-    function _fixData()
-    {
-        $search  = array('&#092;', '&#36;');
-        $replace = array('\',     '$');
-        $this->_introtext = str_replace($search, $replace, $this->_introtext);
-        $this->_bodytext  = str_replace($search, $replace, $this->_bodytext);
-    }
-
 // End Private Methods.
 
 /**************************************************************************/
diff -r 0e50c0174dce -r c6405622b5bf system/lib-admin.php
--- a/system/lib-admin.php	Mon Jul 01 11:32:14 2013 -0400
+++ b/system/lib-admin.php	Mon Jul 01 11:33:04 2013 -0400
@@ -545,7 +545,7 @@
         $admin_templates->set_var('message', $message);
     }
 
-    if ($has_extras) { # now make google-paging
+    if ($has_extras && $showsearch) {
         $hasargs = strstr( $form_url, '?' );
         if( $hasargs ) {
             $sep = '&';