X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Fconfig%2FConfigJson.php;h=23b22269540d46f3a03770ea50865738e31c1209;hb=ce901a58289c72bf7f4dc3515a2be70562cd618b;hp=6b5d73f159440cc1276ff984d48ef0473c668859;hpb=7418f7cb60524c3bfc2f240386b5e3e7eb9b3257;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php
index 6b5d73f1..23b22269 100644
--- a/application/config/ConfigJson.php
+++ b/application/config/ConfigJson.php
@@ -1,4 +1,5 @@
â ' . json_last_error_msg() .'
';
+ if ($errorCode === JSON_ERROR_SYNTAX) {
+ $error .= '
';
+ $error .= 'Please check your JSON syntax (without PHP comment tags) using a JSON lint tool such as ';
+ $error .= 'jsonlint.com.';
+ }
+ throw new \Exception($error);
}
return $data;
}
@@ -34,11 +46,11 @@ class ConfigJson implements ConfigIO
// JSON_PRETTY_PRINT is available from PHP 5.4.
$print = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;
$data = self::getPhpHeaders() . json_encode($conf, $print) . self::getPhpSuffix();
- if (!file_put_contents($filepath, $data)) {
- throw new IOException(
+ if (empty($filepath) || !file_put_contents($filepath, $data)) {
+ throw new \Shaarli\Exceptions\IOException(
$filepath,
- 'Shaarli could not create the config file.
- Please make sure Shaarli has the right to write in the folder is it installed in.'
+ t('Shaarli could not create the config file. '.
+ 'Please make sure Shaarli has the right to write in the folder is it installed in.')
);
}
}
@@ -61,7 +73,7 @@ class ConfigJson implements ConfigIO
*/
public static function getPhpHeaders()
{
- return '';
+ return '*/ ?>';
}
}