[php-blog-cvs] serendipity serendipity_config.inc.php,1.20,1.21

[<gar...@us...>]

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Corrected fallback (languages were always english)


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_config.inc.php	8 Aug 2003 21:01:22 -0000	1.20
+++ serendipity_config.inc.php	8 Aug 2003 23:33:48 -0000	1.21
@@ -56,16 +56,17 @@
     $serendipity['indexFile'] = 'index.php';
 }
 
-// Load fallback language, english
-include_once("{$serendipity['serendipityPath']}/serendipity_lang_en.inc.php");
-// Load chosen language information
+// 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',
                                 ':-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/regular_smile.gif',
@@ -135,7 +136,7 @@
 // We don't care who tells us what to do
 if (!$serendipity['GET']['action']) {
     $serendipity['GET']['action'] = $serendipity['POST']['action'];
-} 
+}
 
 if (!$serendipity['GET']['adminAction']) {
     $serendipity['GET']['adminAction'] = $serendipity['POST']['adminAction'];
@@ -149,7 +150,7 @@
 $serendipity['user']  = $_SESSION['serendipityUser'];
 $serendipity['email'] = $_SESSION['serendipityEmail'];
 
-/** 
+/**
  * Local Variables:
  * c-basic-offset: 4
  * tab-width: 4