[Phpslash-commit] CVS: phpslash-dev/include/modules/block/blocktypes Block_render_navbar.class,1.1.1.1,1.2 Block_render_page.class,1.3,1.4 Block_render_template.class,1.1,1.2

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes
In directory sc8-pr-cvs1:/tmp/cvs-serv2591/phpslash-dev/include/modules/block/blocktypes

Modified Files:
	Block_render_navbar.class Block_render_page.class 
	Block_render_template.class 
Log Message:
reduce php warnings

Index: Block_render_navbar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes/Block_render_navbar.class,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Block_render_navbar.class	12 Mar 2003 16:12:55 -0000	1.1.1.1
--- Block_render_navbar.class	4 Jun 2003 20:02:45 -0000	1.2
***************
*** 28,32 ****
        $navbar = pslNew("NavBar");
        //$navbar->getNavBar("navbarBlock");
!       $this->output = $navbar->getNavBar( $tpl, $this->psl[$menu_ary]);
        //$block_info["cache_data"];
        return 1;
--- 28,36 ----
        $navbar = pslNew("NavBar");
        //$navbar->getNavBar("navbarBlock");
!       if (!empty($menu_ary)) {
!          $this->output = $navbar->getNavBar( $tpl, $this->psl[$menu_ary]);
!       } else {
!          $this->output = $navbar->getNavBar( $tpl); 
!       }
        //$block_info["cache_data"];
        return 1;

Index: Block_render_page.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes/Block_render_page.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Block_render_page.class	23 May 2003 16:45:31 -0000	1.3
--- Block_render_page.class	4 Jun 2003 20:02:45 -0000	1.4
***************
*** 73,77 ****
  
  
!       if(is_object($GLOBALS['template'])) {
           $template = $GLOBALS['template'];
        } else {
--- 73,77 ----
  
  
!       if(array_key_exists('template', $GLOBALS) && is_object($GLOBALS['template'])) {
           $template = $GLOBALS['template'];
        } else {
***************
*** 95,99 ****
           'IMAGEDIR'     => $this->psl['imageurl'],
           'BREADCRUMB'   => $breadcrumb,
!          'STORY_COLUMN' => $allstories,
           'TOP'          => $topblocks,
           'LEFT_BLOCK_COLUMN'    => $leftblocks,
--- 95,99 ----
           'IMAGEDIR'     => $this->psl['imageurl'],
           'BREADCRUMB'   => $breadcrumb,
!          // 'STORY_COLUMN' => $allstories,
           'TOP'          => $topblocks,
           'LEFT_BLOCK_COLUMN'    => $leftblocks,

Index: Block_render_template.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes/Block_render_template.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_render_template.class	16 May 2003 21:10:22 -0000	1.1
--- Block_render_template.class	4 Jun 2003 20:02:45 -0000	1.2
***************
*** 27,31 ****
        
        if(!empty($tpl)){
!          if(is_object($GLOBALS['template'])) {
              $template = $GLOBALS['template'];
           } else {
--- 27,31 ----
        
        if(!empty($tpl)){
!          if(array_key_exists('template', $GLOBALS) && is_object($GLOBALS['template'])) {
              $template = $GLOBALS['template'];
           } else {