[geeklog-cvs] geeklog-1.3/plugins/staticpages functions.inc,1.25,1.26

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages
In directory geeklog_prod:/tmp/cvs-serv23313/staticpages

Modified Files:
	functions.inc 
Log Message:
Don't wrap static pages in a block when the page format is "blank page" (bug #60).


Index: functions.inc
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/functions.inc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** functions.inc	1 Sep 2003 14:43:04 -0000	1.25
--- functions.inc	7 Sep 2003 20:50:43 -0000	1.26
***************
*** 401,405 ****
              }
  
!             if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_title'])) {
                  $retval .= COM_startBlock ($spresult['sp_title']);
              }
--- 401,407 ----
              }
  
!             if (($_SP_CONF['in_block'] == 1) &&
!                     ($spresult['sp_format'] != 'blankpage') &&
!                     !empty ($spresult['sp_title'])) {
                  $retval .= COM_startBlock ($spresult['sp_title']);
              }
***************
*** 412,416 ****
              }
  
!             if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_title'])) {
                  $retval .= COM_endBlock ();
              }
--- 414,420 ----
              }
  
!             if (($_SP_CONF['in_block'] == 1) &&
!                     ($spresult['sp_format'] != 'blankpage') &&
!                     !empty ($spresult['sp_title'])) {
                  $retval .= COM_endBlock ();
              }