Put the methods in order.

dabaki · Nov 24, 2011 · cfffb00 · cfffb00
1 parent f3ba244
commit cfffb00
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/includes/controller/Admin.php b/includes/controller/Admin.php
@@ -2099,30 +2099,6 @@ public function general_settings() {
                 Flash::notice(__("Settings updated."), "/admin/?action=general_settings");
         }
 
-        /**
-         * Function: user_settings
-         * User Settings page.
-         */
-        public function user_settings() {
-            if (!Visitor::current()->group->can("change_settings"))
-                show_403(__("Access Denied"), __("You do not have sufficient privileges to change settings."));
-
-            if (empty($_POST))
-                return $this->display("user_settings", array("groups" => Group::find(array("order" => "id DESC"))));
-
-            if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
-                show_403(__("Access Denied"), __("Invalid security key."));
-
-            $config = Config::current();
-            $set = array($config->set("can_register", !empty($_POST['can_register'])),
-                         $config->set("email_activation", !empty($_POST['email_activation'])),
-                         $config->set("default_group", $_POST['default_group']),
-                         $config->set("guest_group", $_POST['guest_group']));
-
-            if (!in_array(false, $set))
-                Flash::notice(__("Settings updated."), "/admin/?action=user_settings");
-        }
-
         /**
          * Function: content_settings
          * Content Settings page.
@@ -2153,6 +2129,30 @@ public function content_settings() {
                 Flash::notice(__("Settings updated."), "/admin/?action=content_settings");
         }
 
+        /**
+         * Function: user_settings
+         * User Settings page.
+         */
+        public function user_settings() {
+            if (!Visitor::current()->group->can("change_settings"))
+                show_403(__("Access Denied"), __("You do not have sufficient privileges to change settings."));
+
+            if (empty($_POST))
+                return $this->display("user_settings", array("groups" => Group::find(array("order" => "id DESC"))));
+
+            if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
+                show_403(__("Access Denied"), __("Invalid security key."));
+
+            $config = Config::current();
+            $set = array($config->set("can_register", !empty($_POST['can_register'])),
+                         $config->set("email_activation", !empty($_POST['email_activation'])),
+                         $config->set("default_group", $_POST['default_group']),
+                         $config->set("guest_group", $_POST['guest_group']));
+
+            if (!in_array(false, $set))
+                Flash::notice(__("Settings updated."), "/admin/?action=user_settings");
+        }
+
         /**
          * Function: route_settings
          * Route Settings page.