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 9aea367d978c9c1867ddca3795fe079bbde024fb..441cdee811cc550c3e0bb748c8fdb26887b0dc59 100644 (file)
--- a/src/Core/Config/Cache/ConfigCache.php
+++ b/src/Core/Config/Cache/ConfigCache.php
@@ -94,8 +94,9 @@ class ConfigCache implements IConfigCache, IPConfigCache
                }
 
                if ($this->hidePasswordOutput &&
-                       $key == 'password') {
-                       $this->config[$cat][$key] = new HiddenString($value);
+                   $key == 'password' &&
+                   !empty($value) && is_string($value)) {
+                       $this->config[$cat][$key] = new HiddenString((string) $value);
                } else {
                        $this->config[$cat][$key] = $value;
                }