[geeklog-cvs] geeklog-1.3/plugins/staticpages functions.inc,1.38,1.39

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/plugins/staticpages
In directory www:/tmp/cvs-serv29464/plugins/staticpages

Modified Files:
	functions.inc 
Log Message:
For center blocks, ignore the "blank page" setting, unless it's for a page that is supposed to replace the entire frontpage (bug #234)


Index: functions.inc
===================================================================
RCS file: /var/cvs/geeklog-1.3/plugins/staticpages/functions.inc,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** functions.inc	8 Aug 2004 08:55:57 -0000	1.38
--- functions.inc	8 Aug 2004 10:14:49 -0000	1.39
***************
*** 467,473 ****
              }
  
!             if (($spresult['sp_inblock'] == 1) &&
!                     ($spresult['sp_format'] != 'blankpage') &&
!                     !empty ($spresult['sp_title'])) {
                  $retval .= COM_startBlock ($spresult['sp_title'], '',
                      COM_getBlockTemplate ('_staticpages_centerblock', 'header'));
--- 467,472 ----
              }
  
!             if (($spresult['sp_inblock'] == 1) && !empty ($spresult['sp_title'])
!                 && (($where != 0) || ($spresult['sp_format'] != 'blankpage'))) {
                  $retval .= COM_startBlock ($spresult['sp_title'], '',
                      COM_getBlockTemplate ('_staticpages_centerblock', 'header'));
***************
*** 495,501 ****
              }
  
!             if (($spresult['sp_inblock'] == 1) &&
!                     ($spresult['sp_format'] != 'blankpage') &&
!                     !empty ($spresult['sp_title'])) {
                  $retval .= COM_endBlock (COM_getBlockTemplate ('_staticpages_centerblock', 'footer'));
              }
--- 494,499 ----
              }
  
!             if (($spresult['sp_inblock'] == 1) && !empty ($spresult['sp_title'])
!                 && (($where != 0) || ($spresult['sp_format'] != 'blankpage'))) {
                  $retval .= COM_endBlock (COM_getBlockTemplate ('_staticpages_centerblock', 'footer'));
              }