diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-01 17:33:07 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-01 17:33:07 +0100 |
| commit | c9c068115d17132ddcdf2194d216533823831896 (patch) | |
| tree | 702ad1b9e75fe85027986356d1c08b5bb9107311 | |
| parent | 0c6142dad2aa645aa202e72814070d1f47bd9158 (diff) | |
Bug JSON alternative
Suite https://github.com/marienfressinaud/FreshRSS/issues/306
| -rw-r--r-- | lib/lib_rss.php | 4 | ||||
| -rw-r--r-- | public/install.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php index e3deb9792..46bf76d2c 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -3,7 +3,7 @@ if (!function_exists('json_decode')) { require_once('JSON.php'); function json_decode($var) { $JSON = new Services_JSON; - return $JSON->decode($var); + return (array)($JSON->decode($var)); } } @@ -11,7 +11,7 @@ if (!function_exists('json_encode')) { require_once('JSON.php'); function json_encode($var) { $JSON = new Services_JSON; - return $JSON->encode($var); + return $JSON->encodeUnsafe($var); } } diff --git a/public/install.php b/public/install.php index c4ed223de..9b7cc779f 100644 --- a/public/install.php +++ b/public/install.php @@ -599,7 +599,7 @@ function printStep3 () { <div class="form-group"> <label class="group-name" for="base"><?php echo _t ('bdd'); ?></label> <div class="group-controls"> - <input type="text" id="base" name="base" maxlength="64" value="<?php echo isset ($_SESSION['bd_name']) ? $_SESSION['bd_name'] : ''; ?>" placeholder="<?php echo _t ('freshrss'); ?>" /> + <input type="text" id="base" name="base" maxlength="64" value="<?php echo isset ($_SESSION['bd_name']) ? $_SESSION['bd_name'] : ''; ?>" placeholder="freshrss" /> </div> </div> |