From c231070dcc91d976a879674dd3fae7972cb064cf Mon Sep 17 00:00:00 2001 From: msquare Date: Thu, 29 Sep 2016 12:33:03 +0200 Subject: [PATCH] rename ok to valid --- includes/controller/event_config_controller.php | 8 ++++---- includes/sys_page.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/controller/event_config_controller.php b/includes/controller/event_config_controller.php index 2e5175e9..a9709d38 100644 --- a/includes/controller/event_config_controller.php +++ b/includes/controller/event_config_controller.php @@ -50,19 +50,19 @@ function event_config_edit_controller() { $result = check_request_date('buildup_start_date', _("Please enter buildup start date."), true); $buildup_start_date = $result->getValue(); - $valid &= $result->isOk(); + $valid &= $result->isValid(); $result = check_request_date('event_start_date', _("Please enter event start date."), true); $event_start_date = $result->getValue(); - $valid &= $result->isOk(); + $valid &= $result->isValid(); $result = check_request_date('event_end_date', _("Please enter event end date."), true); $event_end_date = $result->getValue(); - $valid &= $result->isOk(); + $valid &= $result->isValid(); $result = check_request_date('teardown_end_date', _("Please enter teardown end date."), true); $teardown_end_date = $result->getValue(); - $valid &= $result->isOk(); + $valid &= $result->isValid(); if ($buildup_start_date != null && $event_start_date != null && $buildup_start_date > $event_start_date) { $valid = false; diff --git a/includes/sys_page.php b/includes/sys_page.php index 78972448..a2f9fff6 100644 --- a/includes/sys_page.php +++ b/includes/sys_page.php @@ -122,8 +122,8 @@ class ValidationResult { /** * Is the value valid? */ - public function isOk() { - return $this->ok; + public function isValid() { + return $this->valid; } /**