From: garvinhicking <garvinhicking>
Date: Wed, 21 Sep 2005 18:11:17 +0000 (+0000)
Subject: Properly die when serendipity_config_local cannot be read.
X-Git-Tag: 0.9~129
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=89a3b4bc01ae76a7fccff08860dd50bf61e53db5;p=s9y.git

Properly die when serendipity_config_local cannot be read.
---

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 22ffb0b..0e48889 100644
--- 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'], '<='));