Merge branch 'master' into develop

[friendica.git] / src / Core / Config / Cache / ConfigCache.php

diff --git a/src/Core/Config/Cache/ConfigCache.php b/src/Core/Config/Cache/ConfigCache.php
index c3cec19e26ee940418fec6c954263bff7e5ed5d8..441cdee811cc550c3e0bb748c8fdb26887b0dc59 100644 (file)
--- a/src/Core/Config/Cache/ConfigCache.php
+++ b/src/Core/Config/Cache/ConfigCache.php
@@ -95,8 +95,8 @@ class ConfigCache implements IConfigCache, IPConfigCache
 
                if ($this->hidePasswordOutput &&
                    $key == 'password' &&
-                   !empty($value)) {
-                       $this->config[$cat][$key] = new HiddenString($value);
+                   !empty($value) && is_string($value)) {
+                       $this->config[$cat][$key] = new HiddenString((string) $value);
                } else {
                        $this->config[$cat][$key] = $value;
                }