[php-blog-cvs] serendipity serendipity_config.inc.php,1.27,1.28

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Remove doublicate query to save configuration options in the $serendipity array


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_config.inc.php	3 Sep 2003 19:59:30 -0000	1.27
+++ serendipity_config.inc.php	3 Sep 2003 20:16:50 -0000	1.28
@@ -46,9 +46,10 @@
                     );
 
 // Load Configuration options from the database
-$rows = serendipity_db_query("SELECT name,value FROM {$serendipity['dbPrefix']}config");
+$rows = serendipity_db_query("SELECT name,value 
+                                FROM {$serendipity['dbPrefix']}config");
 foreach ($rows as $row) {
-    $serendipity[$row['name']] = isset($translation[$row['value']]) ? $translation[$row['value']] : $row['value'];
+    $serendipity[$row['name']] = $serendipity['CONFIG'][$row['name']] = isset($translation[$row['value']]) ? $translation[$row['value']] : $row['value'];
 }
 
 if ($serendipity['embed']) {
@@ -129,13 +130,6 @@
 $serendipity['GET']    =    &$_GET['serendipity'];
 $serendipity['POST']   =   &$_POST['serendipity'];
 $serendipity['COOKIE'] = &$_COOKIE['serendipity'];
-
-// We want our config vars cached... will save us lots of SQL queries
-$sql = "SELECT * FROM {$serendipity['dbPrefix']}config";
-$rs = serendipity_db_query($sql);
-foreach ($rs as $var) {
-    $serendipity['CONFIG'][$var['name']] = $var['value'];
-}
 
 // We don't care who tells us what to do
 if (!$serendipity['GET']['action']) {