[php-blog-cvs] serendipity serendipity_config.inc.php,1.145,1.146

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31847

Modified Files:
	serendipity_config.inc.php 
Log Message:
* make HTTP host autodetectable easier
* allow to configure amount of comments to display


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- serendipity_config.inc.php	16 Feb 2005 12:36:26 -0000	1.145
+++ serendipity_config.inc.php	17 Feb 2005 17:05:20 -0000	1.146
@@ -247,8 +247,9 @@
                                          USERLEVEL_ADMIN => USERLEVEL_ADMIN_DESC);
 
 
-if ($serendipity['embed'] && ($serendipity['embed'] === 'true' || $serendipity['embed'] === true)) {
-    $serendipity['baseURL'] = 'http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];
+if ( (isset($serendipity['autodetect_baseURL']) && serendipity_db_bool($serendipity['autodetect_baseURL'])) ||
+     (isset($serendipity['embed']) && serendipity_db_bool($serendipity['embed'])) ) {
+    $serendipity['baseURL'] = 'http' . (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];
 }
 
 /*