[php-blog-cvs] serendipity serendipity_config.inc.php,1.29,1.30

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv24855

Modified Files:
	serendipity_config.inc.php 
Log Message:
Fixed bug after installation causing language inclusion to fail


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_config.inc.php	4 Sep 2003 16:23:46 -0000	1.29
+++ serendipity_config.inc.php	7 Sep 2003 21:22:11 -0000	1.30
@@ -6,10 +6,14 @@
 
 $serendipity['version'] = '0.3';
 $serendipity['production'] = 1;
-
-// Rewrite always on
 $serendipity['rewrite'] = true;
 
+/* Load main language file */
+require_once('serendipity_lang.inc.php');
+
+/* Load fallback language (english) */
+@include_once("{$serendipity['serendipityPath']}/serendipity_lang_en.inc.php");
+
 
 // We need this if people want to upgrade s9y
 if (!isset($serendipity['templatePath'])) {
@@ -21,7 +25,6 @@
 }
 
 if (!file_exists("{$serendipity['serendipityPath']}serendipity_config_local.inc.php")) {
-    include_once 'serendipity_lang.inc.php';
     die(sprintf(SERENDIPITY_NOT_INSTALLED, 'serendipity_admin.php'));
 }
 
@@ -30,13 +33,11 @@
 include_once("{$serendipity['serendipityPath']}serendipity_functions.inc.php");
 
 if (serendipity_FUNCTIONS_LOADED!== true) {
-    include_once 'serendipity_lang.inc.php';
     die(sprintf(INCLUDE_ERROR, 'serendipity_functions.inc.php'));
 }
 
 // Connect to database
 if (!serendipity_db_connect()) {
-    include_once 'serendipity_lang.inc.php';
     die(DATABASE_ERROR);
 }
 
@@ -68,17 +69,6 @@
 if (!isset($serendipity['indexFile'])) {
     $serendipity['indexFile'] = 'index.php';
 }
-
-// Load basic language information
-include_once("{$serendipity['serendipityPath']}/serendipity_lang_{$serendipity['lang']}.inc.php");
-if (serendipity_LANG_LOADED !== true) {
-    include_once 'serendipity_lang.inc.php';
-    die(sprintf(INCLUDE_ERROR, "serendipity_lang_{$serendipity['lang']}.inc.php"));
-}
-
-// Load fallback language, english (will load any defines which were not yet defined in the chosen language file, if they are ever not in-synch)
-include_once("{$serendipity['serendipityPath']}/serendipity_lang_en.inc.php");
-
 
 // A Set of emoticons to rewrite
 $serendipity['smiles'] = array( ":'("  => $serendipity['serendipityHTTPPath'] . 'pixel/cry_smile.gif',