Properly die when serendipity_config_local cannot be read.

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 22ffb0bdf351e184f20e737e8ff40ce9be4323de..0e48889719378e2a56fa76ee23fe73ec7751c68c 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -154,11 +154,17 @@ if (defined('IN_installer') && IS_installed === false) {
  *   include path
  */
 if (file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php')) {
-    include_once($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php');
+    $local_config = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php';
 } elseif (file_exists($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php')) {
-    include_once($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php');
+    $local_config = $serendipity['serendipityPath'] . '/serendipity_config_local.inc.php';
 } else {
-    include_once(S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php');
+    $local_config = S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php';
+}
+
+if (is_readable($local_config)) {
+    include_once($local_config);
+} else {
+    serendipity_die(sprintf(INCLUDE_ERROR, $local_config));
 }
 
 define('IS_up2date', version_compare($serendipity['version'], $serendipity['versionInstalled'], '<='));