[geeklog-cvs] MVCnPHP Controller.class.php,1.3,1.4

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

Update of /usr/cvs/geeklog/MVCnPHP
In directory internal.geeklog.net:/tmp/cvs-serv6981

Modified Files:
	Controller.class.php 
Log Message:
Now assume MVCnPHP folder is in include_path, also modified it to use new terminology to eliminate confusion

Index: Controller.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Controller.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Controller.class.php	2 May 2003 16:47:55 -0000	1.3
--- Controller.class.php	14 Jul 2003 16:40:14 -0000	1.4
***************
*** 20,24 ****
  
  /**
! * MVCnPHP constants
  */
  require_once 'Constants.php';
--- 20,24 ----
  
  /**
! * Constants used within this MVC framework
  */
  require_once 'Constants.php';
***************
*** 36,44 ****
  
  /**
- * Constants used within this MVC framework
- */
- require_once 'Constants.php';
- 
- /**
  * The controller part of the MVC
  *
--- 36,39 ----
***************
*** 329,338 ****
      function _loadMapping($configType, $configData)
      {
-         if (empty($this->_mvcBase)) {
-             trigger_error('_mvcBase for Controller is empty in Controller::_loadMapping');
-             exit;
-         }
          if (empty($this->_mapLoader)) {
!             $this->_mapLoader = &LoaderFactory::getLoader($this->_mvcBase, $configType);
          }
          $this->_mapping = &$this->_mapLoader->getMapping($this->_object, $this->_viewDir, $this->_commandDir, $this->_baseURL, $this->_configData);
--- 324,330 ----
      function _loadMapping($configType, $configData)
      {
          if (empty($this->_mapLoader)) {
!             $this->_mapLoader = &LoaderFactory::getLoader($configType);
!             
          }
          $this->_mapping = &$this->_mapLoader->getMapping($this->_object, $this->_viewDir, $this->_commandDir, $this->_baseURL, $this->_configData);