diff options
author | fabrixxm <fabrix.xm@gmail.com> | 2011-09-05 21:05:24 +0200 |
---|---|---|
committer | fabrixxm <fabrix.xm@gmail.com> | 2011-09-05 21:05:24 +0200 |
commit | 2f5a34ad1791f01cacb3b86c11501f0e11c67df4 (patch) | |
tree | dd9242b14387c833346f4172e3f190659db56ff7 /mod/admin.php | |
parent | 5ec4a4e6deb5d28cbfab54093f8b4180912738d4 (diff) | |
parent | 08e54234e30c10e3130b7d71caba9fd43e3593e3 (diff) | |
download | volse-hubzilla-2f5a34ad1791f01cacb3b86c11501f0e11c67df4.tar.gz volse-hubzilla-2f5a34ad1791f01cacb3b86c11501f0e11c67df4.tar.bz2 volse-hubzilla-2f5a34ad1791f01cacb3b86c11501f0e11c67df4.zip |
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
Diffstat (limited to 'mod/admin.php')
-rw-r--r-- | mod/admin.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/admin.php b/mod/admin.php index 7799e64ab..da561d554 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -344,7 +344,7 @@ function admin_page_site(&$a) { * Users admin page */ function admin_page_users_post(&$a){ - $pending = ( x(£_POST, 'pending') ? $_POST['pending'] : Array() ); + $pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() ); $users = ( x($_POST, 'user') ? $_POST['user'] : Array() ); if (x($_POST,'page_users_block')){ @@ -540,7 +540,7 @@ function admin_page_plugins(&$a){ } $admin_form=""; - if (in_array($plugin, $a->plugins_admin)){ + if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)){ @require_once("addon/$plugin/$plugin.php"); $func = $plugin.'_plugin_admin'; $func($a, $admin_form); @@ -632,7 +632,7 @@ function admin_page_logs(&$a){ $f = get_config('system','logfile'); $size = filesize($f); - if($size > 5000000) + if($size > 5000000 || $size < 0) $size = 5000000; $data = ''; |