[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9341:180c8869dd61
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/180c8869dd61
user: Tom <websitemaster at cogeco.net>
date: Sat Nov 23 15:08:49 2013 -0500
description:
Merged with upstream

diffstat:

 plugins/spamx/language/hebrew_utf-8.php |  6 +++---
 system/classes/story.class.php          |  4 +---
 system/lib-security.php                 |  2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 1e252dc8daf1 -r 180c8869dd61 plugins/spamx/language/hebrew_utf-8.php
--- a/plugins/spamx/language/hebrew_utf-8.php	Sat Nov 23 15:07:21 2013 -0500
+++ b/plugins/spamx/language/hebrew_utf-8.php	Sat Nov 23 15:08:49 2013 -0500
@@ -5,7 +5,7 @@
  * This is the Hebrew language file for the Geeklog Spam-X plugin
 * Copyright (C) 2013
  * http://lior.weissbrod.com
- * Version 2.0.0#1
+ * Version 2.0.0#2
  * 
  * Licensed under GNU General Public License
  *
@@ -126,8 +126,8 @@
     'email_ip_spam' => '%s או %s × ×™×¡×• להירשם אבל × ×—×©×‘×• כספאם.',
     'edit_personal_blacklist' => 'עריכת רשימה שחורה אישית',
     'mass_delete_spam_comments' => 'מחיקה ×”×ž×•× ×™×ª של תגובות ספאם',
-    'mass_delete_trackback_spam' => 'מחיקה ×”×ž×•× ×™×ª של רשימה שחורה של HTTP Header',
-    'edit_http_header_blacklist' => 'Edit HTTP Header Blacklist',
+    'mass_delete_trackback_spam' => 'מחיקה ×”×ž×•× ×™×ª של ספאם trackback',
+    'edit_http_header_blacklist' => 'עריכת רשימה שחורה של HTTP Header',
     'edit_ip_blacklist' => 'עריכת רשימה שחורה של IP',
     'edit_ip_url_blacklist' => 'עריכת IP של רשימה שחורה של כתובות אתרי ××™× ×˜×¨× ×˜',
     'edit_sfs_blacklist' => 'עריכת רשימה שחורה של אימייל SFS',
diff -r 1e252dc8daf1 -r 180c8869dd61 system/classes/story.class.php
--- a/system/classes/story.class.php	Sat Nov 23 15:07:21 2013 -0500
+++ b/system/classes/story.class.php	Sat Nov 23 15:08:49 2013 -0500
@@ -397,8 +397,6 @@
      */
     function loadFromArray($story)
     {
-        global $_USER;
-        
         /* Use the magic cheat array to quickly reload the whole story
          * from the database result array, doing the quick stripslashes.
          */
@@ -457,6 +455,7 @@
 
         $sid = DB_escapeString(COM_applyFilter($sid));
 
+        $sql = array();
         if (!empty($sid) && (($mode == 'edit') || ($mode == 'view') || ($mode == 'clone'))) {
             if (empty($topic)) {
                 $topic_sql = ' AND ta.tdefault = 1';
@@ -464,7 +463,6 @@
                 $topic_sql = " AND ta.tid = '{$topic}'";
             }
 
-            $sql = array();
             /* Original
             $sql['mysql'] = "SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) AS unixdate, UNIX_TIMESTAMP(s.expire) AS expireunix, UNIX_TIMESTAMP(s.comment_expire) AS cmt_expire_unix, "
                 . "u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl " . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, {$_TABLES['topics']} AS t " . "WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND (sid = '$sid')";
diff -r 1e252dc8daf1 -r 180c8869dd61 system/lib-security.php
--- a/system/lib-security.php	Sat Nov 23 15:07:21 2013 -0500
+++ b/system/lib-security.php	Sat Nov 23 15:08:49 2013 -0500
@@ -568,7 +568,7 @@
         }
     }
 
-    if ((empty ($_USER['uid']) && ($uid == 1)) || ($uid == $_USER['uid'])) {
+    if ((empty ($_USER['uid']) && ($uid == 1)) || (!empty ($_USER['uid']) && ($uid == $_USER['uid']))) {
         if (empty ($_GROUPS)) {
             $_GROUPS = SEC_getUserGroups ($uid);
         }