[geeklog-hg] geeklog: Fixed a bug where an error occurred when saving configu...

[geeklog-cvs at lists.geeklog.net]

changeset 9431:c202f3eeb32e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c202f3eeb32e
user: Kenji ITO <mystralkk at gmail.com>
date: Sat Jan 18 12:25:33 2014 +0900
description:
Fixed a bug where an error occurred when saving configuration for Filemanager

diffstat:

 public_html/admin/configuration_validation.php |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r d2f23bdd0891 -r c202f3eeb32e public_html/admin/configuration_validation.php
--- a/public_html/admin/configuration_validation.php	Fri Jan 17 22:23:33 2014 +0900
+++ b/public_html/admin/configuration_validation.php	Sat Jan 18 12:25:33 2014 +0900
@@ -602,10 +602,12 @@
 $_CONF_VALIDATE['Core']['breadcrumb_root_site_name']    = array('rule' => 'boolean');
 
 // Subgroup Filemanager, Tab General Settings
-$_CONF_VALIDATE['Core']['filemanager_disabled']         = array('rule' => 'boolean');
+$_CONF_VALIDATE['Core']['filemanager_disabled']            = array('rule' => 'boolean');
 $_CONF_VALIDATE['Core']['filemanager_browse_only']         = array('rule' => 'boolean');
-$_CONF_VALIDATE['Core']['filemanager_default_view_mode']   = array('inList', array('grid', 'list'), true);
-$_CONF_VALIDATE['Core']['filemanager_show_confirmation']         = array('rule' => 'boolean');
+$_CONF_VALIDATE['Core']['filemanager_default_view_mode']   = array(
+    'rule' => array('inList', array('grid', 'list'), true)
+);
+$_CONF_VALIDATE['Core']['filemanager_show_confirmation']   = array('rule' => 'boolean');
 $_CONF_VALIDATE['Core']['filemanager_search_box']          = array('rule' => 'boolean');
 $_CONF_VALIDATE['Core']['filemanager_file_sorting']        = array(
     'inList',
@@ -623,8 +625,8 @@
 
 // Subgroup Filemanager, Tab Upload
 //$_CONF_VALIDATE['Core']['filemanager_upload_restrictions'] = array('rule' => 'boolean');
-$_CONF_VALIDATE['Core']['filemanager_upload_overwrite']      = array('rule' => 'boolean');
-$_CONF_VALIDATE['Core']['filemanager_upload_images_only']    = array('rule' => 'boolean');
+$_CONF_VALIDATE['Core']['filemanager_upload_overwrite']       = array('rule' => 'boolean');
+$_CONF_VALIDATE['Core']['filemanager_upload_images_only']     = array('rule' => 'boolean');
 $_CONF_VALIDATE['Core']['filemanager_upload_file_size_limit'] = array('rule' => 'numeric');
 //$_CONF_VALIDATE['Core']['filemanager_unallowed_files'] = array('rule' => 'boolean');
 //$_CONF_VALIDATE['Core']['filemanager_unallowed_dirs'] = array('rule' => 'boolean');