phpmp-commits

[Brian R. <hei...@us...>]

Update of /cvsroot/phpmp/phpMP
In directory usw-pr-cvs1:/tmp/cvs-serv4148

Modified Files:
	modules.php 
Log Message:
Actually fixed the module double-include bug.  It didn't happen but it wasn't fixed before.  Hmm.

Index: modules.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/modules.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** modules.php	23 Apr 2002 08:14:54 -0000	1.6
--- modules.php	21 Jul 2002 22:40:44 -0000	1.7
***************
*** 71,78 ****
    
    function DoCheck() {
!     if(($this->_inactive == 1) || ($this->_exists != 1) || defined('PHPMP_MOD_' . $mod_id)) {
        return 0;
      } else {
!       define('PHPMP_MOD_' . $mod_id, true);
        return 1;
      }
--- 71,78 ----
    
    function DoCheck() {
!     if(($this->_inactive == 1) || ($this->_exists != 1) || defined('PHPMP_MOD_' . $MPCONF['MOD']['mod_id'])) {
        return 0;
      } else {
!       define('PHPMP_MOD_' . $MPCONF['MOD']['mod_id'], true);
        return 1;
      }
***************
*** 85,95 ****
  $ModCheck = $ModClass->DoCheck();
  
  if($ModCheck != 0) {
    include($MPCONF['GEN']['abs_path'] . '/modules/' . $MPCONF['MOD']['filename']);
  
    $Module->Init();
  }
  
! $Template->PrintHeader( array(PAGETITLE => ".::" . $Module->pagetitle . "::.") );
  
  $Template->CreateSide('left');
--- 85,99 ----
  $ModCheck = $ModClass->DoCheck();
  
+ $my_page_title = "Module Error";
+ 
  if($ModCheck != 0) {
    include($MPCONF['GEN']['abs_path'] . '/modules/' . $MPCONF['MOD']['filename']);
  
    $Module->Init();
+   
+   $my_page_title = $Module->pagetitle;
  }
  
! $Template->PrintHeader( array(PAGETITLE => $my_page_title) );
  
  $Template->CreateSide('left');