Merging upstream version 1.11.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/application/controllers/SelfServiceController.php b/application/controllers/SelfServiceController.php
index 0b3b642..c3c9bb5 100644
--- a/application/controllers/SelfServiceController.php
+++ b/application/controllers/SelfServiceController.php
@@ -194,7 +194,7 @@ class SelfServiceController extends ActionController
         } else {
             throw new ProgrammingError(
                 'Expected boolean value, got %s',
-                var_export($value, 1)
+                var_export($value, true)
             );
         }
     }
@@ -275,7 +275,7 @@ class SelfServiceController extends ActionController
             // PluginsUrl => framework_plugins_url
         ];
         $username = $settings->get('self-service/icinga_service_user');
-        if ($username !== null && strlen($username) > 0) {
+        if ($username) {
             $params['icinga_service_user'] = $username;
         }
 
@@ -404,7 +404,7 @@ class SelfServiceController extends ActionController
     {
         foreach ($keys as $key) {
             $value = $settings->get("self-service/$key");
-            if (strlen($value)) {
+            if ($value) {
                 $params[$key] = $value;
             }
         }