diff options
| author | Felipe Figueroa <amenadiel@gmail.com> | 2018-04-26 02:30:44 +0300 |
|---|---|---|
| committer | Felipe Figueroa <amenadiel@gmail.com> | 2018-04-26 02:30:44 +0300 |
| commit | f4d730867fa82fdd64c1302ee02354e1568979a0 (patch) | |
| tree | 26ba4a34d427a1782987b3fca6e862c1ddc69ab7 /src/controllers/DisplayController.php | |
| parent | d8a7192171310edf0c10d82ce037fd861411a4ff (diff) | |
fixes more issues
Diffstat (limited to 'src/controllers/DisplayController.php')
| -rw-r--r-- | src/controllers/DisplayController.php | 61 |
1 files changed, 38 insertions, 23 deletions
diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php index 3a29be94..74f05185 100644 --- a/src/controllers/DisplayController.php +++ b/src/controllers/DisplayController.php @@ -311,11 +311,14 @@ class DisplayController extends BaseController 'attr' => [ 'href' => [ 'url' => 'display', - 'urlvars' => array_merge([ - 'action' => 'confeditrow', - 'strings' => $_REQUEST['strings'], - 'page' => $_REQUEST['page'], - ], $_gets), + 'urlvars' => array_merge( + [ + 'action' => 'confeditrow', + 'strings' => $_REQUEST['strings'], + 'page' => $_REQUEST['page'], + ], + $_gets + ), ], ], ], @@ -324,11 +327,14 @@ class DisplayController extends BaseController 'attr' => [ 'href' => [ 'url' => 'display', - 'urlvars' => array_merge([ - 'action' => 'confdelrow', - 'strings' => $_REQUEST['strings'], - 'page' => $_REQUEST['page'], - ], $_gets), + 'urlvars' => array_merge( + [ + 'action' => 'confdelrow', + 'strings' => $_REQUEST['strings'], + 'page' => $_REQUEST['page'], + ], + $_gets + ), ], ], ], @@ -454,10 +460,13 @@ class DisplayController extends BaseController 'attr' => [ 'href' => [ 'url' => 'database', - 'urlvars' => array_merge($fields, [ - 'action' => 'sql', - 'paginate' => 'on', - ]), + 'urlvars' => array_merge( + $fields, + [ + 'action' => 'sql', + 'paginate' => 'on', + ] + ), ], ], 'content' => $this->lang['streditsql'], @@ -507,10 +516,13 @@ class DisplayController extends BaseController 'attr' => [ 'href' => [ 'url' => 'views', - 'urlvars' => array_merge($fields, [ - 'action' => 'create', - 'formDefinition' => $_REQUEST['query'], - ]), + 'urlvars' => array_merge( + $fields, + [ + 'action' => 'create', + 'formDefinition' => $_REQUEST['query'], + ] + ), ], ], 'content' => $this->lang['strcreateview'], @@ -539,10 +551,13 @@ class DisplayController extends BaseController 'attr' => [ 'href' => [ 'url' => 'tables', - 'urlvars' => array_merge($fields, [ - 'action' => 'confinsertrow', - 'table' => $object, - ]), + 'urlvars' => array_merge( + $fields, + [ + 'action' => 'confinsertrow', + 'table' => $object, + ] + ), ], ], 'content' => $this->lang['strinsert'], @@ -846,7 +861,7 @@ class DisplayController extends BaseController } /** - * build & return the FK information data structure + * Build & return the FK information data structure * used when deciding if a field should have a FK link or not. * * @return [type] [description] |