Merge branch 'master' into configmgr_improvements

Conflicts:
	inc/auth.php
	inc/template.php
	lib/plugins/authad/lang/zh/settings.php
	lib/plugins/authldap/lang/en/settings.php
	lib/plugins/authldap/lang/zh/settings.php
	lib/plugins/authmysql/lang/zh/settings.php
	lib/plugins/config/settings/config.class.php
	lib/plugins/usermanager/admin.php

1 files changed, 12 insertions, 12 deletions

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 1c7d8f680..6de560128 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -1101,14 +1101,14 @@ if (!class_exists('setting_regex')){
         var $_delimiter = '/';    // regex delimiter to be used in testing input
         var $_pregflags = 'ui';   // regex pattern modifiers to be used in testing input
 
-        /**

-         *  update changed setting with user provided value $input

-         *  - if changed value fails error check, save it to $this->_input (to allow echoing later)

-         *  - if changed value passes error check, set $this->_local to the new value

-         *

-         *  @param  mixed   $input   the new value

-         *  @return boolean          true if changed, false otherwise (incl. on error)

-         */

+        /**
+         *  update changed setting with user provided value $input
+         *  - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         *  - if changed value passes error check, set $this->_local to the new value
+         *
+         *  @param  mixed   $input   the new value
+         *  @return boolean          true if changed, false otherwise (incl. on error)
+         */
         function update($input) {
 
             // let parent do basic checks, value, not changed, etc.
@@ -1125,9 +1125,9 @@ if (!class_exists('setting_regex')){
                 $this->_error = true;
                 return false;
             }
-

-            $this->_local = $input;

-            return true;

+
+            $this->_local = $input;
+            return true;
         }
     }
-}
\ No newline at end of file
+}