[php-blog-cvs] serendipity serendipity_config.inc.php,1.11,1.12

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
We now have $serendipity['CONFIG'] and thereby save lots of SQL queries
We also need to set rewrite to ON and make sure templatePath is set


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_config.inc.php	25 May 2003 16:36:33 -0000	1.11
+++ serendipity_config.inc.php	22 Jun 2003 18:09:01 -0000	1.12
@@ -3,6 +3,13 @@
 include_once('compat.php');
 ini_set("session.use_trans_sid",0);
 $serendipity['production'] = 1;
+// Rewrite always on
+$serendipity['rewrite'] = true;
+// We need this if people want to upgrade s9y
+if (!isset($serendipity['templatePath'])) {
+	$serendipity['templatePath'] = 'templates/';
+}
+
 if (!isset($serendipity['serendipityPath'])) {
 	$serendipity['serendipityPath'] = './';
 }
@@ -97,6 +104,13 @@
 $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"]) {
     $serendipity["GET"]["action"] = $serendipity["POST"]["action"];