[geeklog-cvs] Geeklog-1.x/public_html/staticpages index.php, 1.33, 1.33.2.1

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv20087/public_html/staticpages

Modified Files:
      Tag: geeklog_1_4_1_1
	index.php 
Log Message:
Allow the static pages "page format" setting to override $_CONF['show_right_blocks'] (ported over from the trunk)


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/staticpages/index.php,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -C2 -d -r1.33 -r1.33.2.1
*** index.php	10 Dec 2006 12:08:40 -0000	1.33
--- index.php	9 Jun 2007 17:55:53 -0000	1.33.2.1
***************
*** 103,106 ****
--- 103,108 ----
      	if (($A['sp_format'] == 'allblocks') && ($noboxes != 1)) {
              $retval .= COM_siteFooter (true);
+         } else if (($A['sp_format'] == 'leftblocks') || ($A['sp_format'] == 'noblocks')) {
+             $retval .= COM_siteFooter (false);
      	} else {
              $retval .= COM_siteFooter ();