Merge pull request #1540 from ArthurHoaro/fix/metadata-regexes

[github/shaarli/Shaarli.git] / application / Utils.php

diff --git a/application/Utils.php b/application/Utils.php
index 72c90049b9b41c3e7926bede39c4caf6facc2a6a..bcfda65c9ca14cef75aac304396f0512dba500d5 100644 (file)
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -91,14 +91,18 @@ function endsWith($haystack, $needle, $case = true)
  */
 function escape($input)
 {
-    if (is_bool($input)) {
+    if (null === $input) {
+        return null;
+    }
+
+    if (is_bool($input) || is_int($input) || is_float($input) || $input instanceof DateTimeInterface) {
         return $input;
     }
 
     if (is_array($input)) {
         $out = array();
         foreach ($input as $key => $value) {
-            $out[$key] = escape($value);
+            $out[escape($key)] = escape($value);
         }
         return $out;
     }