From 9fce3b22aa76fe68abe81f36b46a763df0535aef Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 30 Sep 2016 16:55:23 +0200 Subject: fix issues after changing codestyle --- includes/sys_menu.php | 14 +++++++------- includes/sys_page.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 2851a240..42376019 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -1,6 +1,6 @@ questions_title() ]; - foreach ($pages as $page => $title) { - if (in_array($page, $privileges)) { - $menu[] = toolbar_item_link(page_link_to($page), '', $title, $page == $page); + foreach ($pages as $menu_page => $title) { + if (in_array($menu_page, $privileges)) { + $menu[] = toolbar_item_link(page_link_to($menu_page), '', $title, $menu_page == $page); } } @@ -145,9 +145,9 @@ function make_navigation() { "admin_event_config" => event_config_title() ]; - foreach ($admin_pages as $page => $title) { - if (in_array($page, $privileges)) { - $admin_menu[] = toolbar_item_link(page_link_to($page), '', $title, $page == $page); + foreach ($admin_pages as $menu_page => $title) { + if (in_array($menu_page, $privileges)) { + $admin_menu[] = toolbar_item_link(page_link_to($menu_page), '', $title, $menu_page == $page); } } diff --git a/includes/sys_page.php b/includes/sys_page.php index a2f9fff6..a6daaae1 100644 --- a/includes/sys_page.php +++ b/includes/sys_page.php @@ -115,7 +115,7 @@ class ValidationResult { * The validated value */ public function ValidationResult($valid, $value) { - $this->ok = $valid; + $this->valid = $valid; $this->value = $value; } -- cgit v1.2.3-70-g09d2