mirror_php/formwork
1
0
Fork 0
mirror of https://github.com/getformwork/formwork.git synced 2025-02-24 09:42:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix methods conflict in Options controller

Browse Source
This commit is contained in:
Giuseppe Criscione 2018-10-13 14:27:32 +02:00
parent 2d1006ea93
commit 47992e5450
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/Admin.php
View File

@ -202,12 +202,12 @@ class Admin
$this->router->add( $this->router->add(
array('GET', 'POST'), array('GET', 'POST'),
'/options/system/', '/options/system/',
array(new Controllers\Options(), 'system') array(new Controllers\Options(), 'systemOptions')
); );
$this->router->add( $this->router->add(
array('GET', 'POST'), array('GET', 'POST'),
'/options/site/', '/options/site/',
array(new Controllers\Options(), 'site') array(new Controllers\Options(), 'siteOptions')
); );
$this->router->add( $this->router->add(
'/options/updates/', '/options/updates/',

4
admin/src/Controllers/Options.php
View File

@ -20,7 +20,7 @@ class Options extends AbstractController
$this->redirect('/options/system/', 302, true); $this->redirect('/options/system/', 302, true);
} }
public function system() public function systemOptions()
{ {
$this->ensurePermission('options.system'); $this->ensurePermission('options.system');
@ -51,7 +51,7 @@ class Options extends AbstractController
)); ));
} }
public function site() public function siteOptions()
{ {
$this->ensurePermission('options.site'); $this->ensurePermission('options.site');