summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2016-09-30 16:55:23 +0200
committermsquare <msquare@notrademark.de>2016-09-30 16:55:23 +0200
commit9fce3b22aa76fe68abe81f36b46a763df0535aef (patch)
treee4be3a14f9511783d6c14a6a1bad881857655148
parent9ad90882600e89c4682397870879c8403576bc74 (diff)
fix issues after changing codestyle
-rw-r--r--includes/sys_menu.php14
-rw-r--r--includes/sys_page.php2
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 @@
<?php
-function page_link_to($page) {
+function page_link_to($page = "") {
if ($page == "") {
return '?';
}
@@ -123,9 +123,9 @@ function make_navigation() {
"user_questions" => 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;
}