Fix methods conflict in Options controller

getformwork · Oct 13, 2018 · c8fc891 · c8fc891
1 parent 0eb1b1a
commit c8fc891
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/admin/src/Admin.php b/admin/src/Admin.php
@@ -202,12 +202,12 @@ function (RouteParams $params) {
         $this->router->add(
             array('GET', 'POST'),
             '/options/system/',
-            array(new Controllers\Options(), 'system')
+            array(new Controllers\Options(), 'systemOptions')
         );
         $this->router->add(
             array('GET', 'POST'),
             '/options/site/',
-            array(new Controllers\Options(), 'site')
+            array(new Controllers\Options(), 'siteOptions')
         );
         $this->router->add(
             '/options/updates/',

diff --git a/admin/src/Controllers/Options.php b/admin/src/Controllers/Options.php
@@ -20,7 +20,7 @@ public function index()
         $this->redirect('/options/system/', 302, true);
     }
 
-    public function system()
+    public function systemOptions()
     {
         $this->ensurePermission('options.system');
 
@@ -51,7 +51,7 @@ public function system()
         ));
     }
 
-    public function site()
+    public function siteOptions()
     {
         $this->ensurePermission('options.site');