[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9216:3dbeddd40b59
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3dbeddd40b59
user: Tom <websitemaster at cogeco.net>
date: Sat Jul 20 10:28:57 2013 -0400
description:
Merged with upstream

diffstat:

 system/classes/gltext.class.php |  2 +-
 system/classes/story.class.php  |  4 ++--
 system/lib-plugins.php          |  4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 394088a3f327 -r 3dbeddd40b59 system/classes/gltext.class.php
--- a/system/classes/gltext.class.php	Sat Jul 20 10:27:29 2013 -0400
+++ b/system/classes/gltext.class.php	Sat Jul 20 10:28:57 2013 -0400
@@ -283,7 +283,7 @@
      * @access  private
      *
      */
-    private function _displayEscape($text)
+    private static function _displayEscape($text)
     {
         return str_replace(
             array('$',     '{',      '}',      '\\'),
diff -r 394088a3f327 -r 3dbeddd40b59 system/classes/story.class.php
--- a/system/classes/story.class.php	Sat Jul 20 10:27:29 2013 -0400
+++ b/system/classes/story.class.php	Sat Jul 20 10:28:57 2013 -0400
@@ -47,7 +47,7 @@
  *
  */
 
-require_once $_CONF['path_system'] . 'classes/gltext.class.php';
+require_once 'gltext.class.php';
 
 /**
  * Constants for stories:
@@ -872,7 +872,7 @@
      */
     function loadFromArgsArray(&$array)
     {
-        global $_TABLES;
+        global $_TABLES, $_CONF;
 
         /* magic_quotes_gpc cleanup routine now in submitstory() in
          * /public_html/admin/story.php
diff -r 394088a3f327 -r 3dbeddd40b59 system/lib-plugins.php
--- a/system/lib-plugins.php	Sat Jul 20 10:27:29 2013 -0400
+++ b/system/lib-plugins.php	Sat Jul 20 10:28:57 2013 -0400
@@ -2399,7 +2399,7 @@
 */
 function PLG_submissionSaved($type)
 {
-    global $_PLUGINS;
+    global $_CONF, $_PLUGINS;
     
     $t = explode('.', $type);
     $plg_type = $t[0];    
@@ -2438,7 +2438,7 @@
 */
 function PLG_submissionDeleted($type)
 {
-    global $_PLUGINS;
+    global $_CONF, $_PLUGINS;
 
     $t = explode('.', $type);
     $plg_type = $t[0];