From c5bece40b18e063709520c127c33815e626967e6 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 26 Oct 2010 19:54:43 +0200 Subject: Fix GET-after-POST redirect in plugin manager The redirect target URL is constructed with escaped ampersands since b625808123f. Thanks to Chris Tapp for pointing out. --- lib/plugins/plugin/classes/ap_manage.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/plugin/classes/ap_manage.class.php') diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php index 656b4762b..2982a3ebb 100644 --- a/lib/plugins/plugin/classes/ap_manage.class.php +++ b/lib/plugins/plugin/classes/ap_manage.class.php @@ -121,7 +121,7 @@ class ap_manage { // update latest plugin date - FIXME global $ID; - send_redirect(wl($ID,array('do'=>'admin','page'=>'plugin'),true)); + send_redirect(wl($ID,array('do'=>'admin','page'=>'plugin'),true, '&')); } /** -- cgit v1.2.3 From 20aa97d937a545472ddb376ffdbefeea5aa0c497 Mon Sep 17 00:00:00 2001 From: Myron Turner Date: Sun, 6 Feb 2011 13:45:23 +0100 Subject: Don't delete the contents of symbolically linked directories in the plugin manager This patch makes the plugin manager not descend into symbolically linked directories as this behaviour is not expected from a recursive delete. --- lib/plugins/plugin/classes/ap_manage.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/plugin/classes/ap_manage.class.php') diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php index 2982a3ebb..fb148f263 100644 --- a/lib/plugins/plugin/classes/ap_manage.class.php +++ b/lib/plugins/plugin/classes/ap_manage.class.php @@ -176,7 +176,7 @@ class ap_manage { function dir_delete($path) { if (!is_string($path) || $path == "") return false; - if (is_dir($path)) { + if (is_dir($path) && !is_link($path)) { if (!$dh = @opendir($path)) return false; while ($f = readdir($dh)) { -- cgit v1.2.3