[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.680,1.681

[Dirk Haun]

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

Modified Files:
	lib-common.php 
Log Message:
Cleanup: handle undefined $what; removed commented-out <ul>...</ul>


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.680
retrieving revision 1.681
diff -C2 -d -r1.680 -r1.681
*** lib-common.php	20 Feb 2008 20:07:58 -0000	1.680
--- lib-common.php	24 Feb 2008 08:54:51 -0000	1.681
***************
*** 1397,1401 ****
           * This can be used to take control over what blocks are then displayed
           */
!         if( is_array( $what ))
          {
              $function = $what[0];
--- 1397,1401 ----
           * This can be used to take control over what blocks are then displayed
           */
!         if( isset( $what) && is_array( $what ))
          {
              $function = $what[0];
***************
*** 1409,1413 ****
              }
          }
!         else if( $what <> 'none' )
          {
              // Now show any blocks -- need to get the topic if not on home page
--- 1409,1413 ----
              }
          }
!         else if( !isset( $what ) || ( $what <> 'none' ))
          {
              // Now show any blocks -- need to get the topic if not on home page
***************
*** 2335,2339 ****
          $retval .= COM_startBlock( $LANG01[47], $help,
                             COM_getBlockTemplate( 'user_block', 'header' ));
- //      $retval .= '<ul>';
          $login = new Template( $_CONF['path_layout'] );
          $login->set_file( 'form', 'loginform.thtml' );
--- 2335,2338 ----
***************
*** 2400,2404 ****
  
          $retval .= $login->parse( 'output', 'form' );
- //      $retval .= '</ul>';
          $retval .= COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
--- 2399,2402 ----