[geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.95, 1.96

[Dirk Haun]

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

Modified Files:
	functions.inc 
Log Message:
Allow the static pages "page format" setting to override $_CONF['show_right_blocks']


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** functions.inc	8 May 2007 19:24:08 -0000	1.95
--- functions.inc	9 Jun 2007 17:48:21 -0000	1.96
***************
*** 224,227 ****
--- 224,229 ----
          if (($A['sp_format'] == 'allblocks') && ($_USER['noboxes'] != 1)) {
              $retval .= COM_siteFooter(true);
+         } else if (($A['sp_format'] == 'leftblocks') || ($A['sp_format'] == 'noblocks')) {
+             $retval .= COM_siteFooter(false);
          } else {
              $retval .= COM_siteFooter();