[geeklog-hg] geeklog: Plugin upload feature now rejects upload of a plugin th...

[geeklog-cvs at lists.geeklog.net]

changeset 9387:b7b53ec692fc
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b7b53ec692fc
user: Kenji ITO <mystralkk at gmail.com>
date: Sun Jan 05 18:19:05 2014 +0900
description:
Plugin upload feature now rejects upload of a plugin that is already installed (bug #0001715)

diffstat:

 public_html/admin/plugins.php |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (18 lines):

diff -r 16a638f05622 -r b7b53ec692fc public_html/admin/plugins.php
--- a/public_html/admin/plugins.php	Sun Jan 05 10:07:26 2014 +0100
+++ b/public_html/admin/plugins.php	Sun Jan 05 18:19:05 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';