[geeklog-hg] geeklog: Merged with HEAD

[geeklog-cvs at lists.geeklog.net]

changeset 9389:32d07561f405
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/32d07561f405
user: Kenji ITO <mystralkk at gmail.com>
date: Sun Jan 05 18:29:51 2014 +0900
description:
Merged with HEAD

diffstat:

 plugins/spamx/IP.Examine.class.php |  6 +++---
 public_html/admin/plugins.php      |  8 ++++----
 system/classes/config.class.php    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (60 lines):

diff -r 51f5c6a15032 -r 32d07561f405 plugins/spamx/IP.Examine.class.php
--- a/plugins/spamx/IP.Examine.class.php	Sun Jan 05 08:20:25 2014 +0900
+++ b/plugins/spamx/IP.Examine.class.php	Sun Jan 05 18:29:51 2014 +0900
@@ -128,14 +128,14 @@
     /**
      * Private internal method to match an IP address against an address range
      *
+     * Original authors: dh06 and Stephane, taken from
+     * @link http://www.php.net/manual/en/function.ip2long.php#70707
+     *
      * @param   string  $ip     IP address to check
      * @param   string  $range  IP address range to check against
      * @return  boolean         true if IP falls into the IP range, else false
      * @access  private
      *
-     * Original authors: dh06 and Stephane, taken from
-     * @link http://www.php.net/manual/en/function.ip2long.php#70707
-     *
      */
     function _matchRange($ip, $range)
     {
diff -r 51f5c6a15032 -r 32d07561f405 public_html/admin/plugins.php
--- a/public_html/admin/plugins.php	Sun Jan 05 08:20:25 2014 +0900
+++ b/public_html/admin/plugins.php	Sun Jan 05 18:29:51 2014 +0900
@@ -731,10 +731,10 @@
                     $pi_was_enabled = ($A['pi_enabled'] == 1);
                 }
 
-                if ($pi_was_enabled) {
-                    // disable temporarily while we move the files around
-                    DB_change($_TABLES['plugins'], 'pi_enabled', 0,
-                                                   'pi_name', $dirname);
+                // Prevents the existing plugin from being overwritten with
+                // the files uploaded
+                if ($pi_was_enabled || $pi_had_entry) {
+                    return COM_refresh($_CONF['site_admin_url'] . '/plugins.php?msg=99');
                 }
 
                 require_once 'System.php';
diff -r 51f5c6a15032 -r 32d07561f405 system/classes/config.class.php
--- a/system/classes/config.class.php	Sun Jan 05 08:20:25 2014 +0900
+++ b/system/classes/config.class.php	Sun Jan 05 18:29:51 2014 +0900
@@ -1136,7 +1136,7 @@
      * @param  mixed  $selectionArray Array of option of select element
      * @param  bool   $deleteable If configuration is deleteable
      * @param  bool   $allow_reset Allow set and unset of configuration
-     * @return
+     * @return string
      */
     function _UI_get_conf_element($group, $name, $display_name, $type, $val,
                                   $selectionArray = null , $deletable = false,
@@ -1316,7 +1316,7 @@
      * @param  mixed  $selectionArray Array of option of select element
      * @param  bool   $deleteable If configuration is deleteable
      * @param  bool   $allow_reset Allow set and unset of configuration
-     * @return
+     * @return string
      */
     function _UI_get_conf_element_2($group, $name, $display_name, $type, $val,
                                   $selectionArray = null , $deletable = false,