diff options
| author | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
| commit | f77fc90de1e477b721442757cd7413f91cccc044 (patch) | |
| tree | 2abb734dacf39419b96b6b70c65115de57228fc3 /lib/plugins/plugin/classes | |
| parent | b8c040db1fdc0eee80963e57d95a15fd3813912d (diff) | |
| parent | bd07158f0f2569ae470f980dd49d69b7f1fd2c49 (diff) | |
| download | rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.gz rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.bz2 | |
Merge branch 'master' into indexer_rewrite
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
Diffstat (limited to 'lib/plugins/plugin/classes')
| -rw-r--r-- | lib/plugins/plugin/classes/ap_download.class.php | 2 | ||||
| -rw-r--r-- | lib/plugins/plugin/classes/ap_manage.class.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index beba0ab07..784095aaf 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -1,7 +1,7 @@ <?php class ap_download extends ap_manage { - var $overwrite = false; + var $overwrite = true; /** * Initiate the plugin download 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)) { |