[Gemstracker-svn] SF.net SVN: gemstracker:[1038] trunk/library

[<gem...@li...>]

Revision: 1038
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1038&view=rev
Author:   matijsdejong
Date:     2012-11-22 17:29:49 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Removed last uses of GEMS_PROJECT_PATH
Fixed bug occurring during tests

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/ProjectInformationAction.php
    trunk/library/classes/Gems/Events.php
    trunk/library/classes/GemsEscort.php
    trunk/library/pre_bootstrap.php

Modified: trunk/library/classes/Gems/Default/ProjectInformationAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ProjectInformationAction.php	2012-11-22 15:59:49 UTC (rev 1037)
+++ trunk/library/classes/Gems/Default/ProjectInformationAction.php	2012-11-22 17:29:49 UTC (rev 1038)
@@ -138,7 +138,6 @@
         $data[$this->_('Gems project')]            = GEMS_PROJECT_NAME;
         $data[$this->_('Gems web directory')]      = GEMS_ROOT_DIR;
         $data[$this->_('Gems code directory')]     = GEMS_LIBRARY_DIR;
-        $data[$this->_('Gems project path')]       = GEMS_PROJECT_PATH;
         $data[$this->_('MUtil version')]           = MUtil_Version::get();
         $data[$this->_('Zend version')]            = Zend_Version::VERSION;
         $data[$this->_('Application environment')] = APPLICATION_ENV;

Modified: trunk/library/classes/Gems/Events.php
===================================================================
--- trunk/library/classes/Gems/Events.php	2012-11-22 15:59:49 UTC (rev 1037)
+++ trunk/library/classes/Gems/Events.php	2012-11-22 17:29:49 UTC (rev 1038)
@@ -110,7 +110,7 @@
             $prefix = $name . '_' . self::EVENTS_DIR . '_' . $eventClass . '_';
             $paths[$prefix] = $dir . '/' . $name . '/' . self::EVENTS_DIR . '/' . $eventType;
         }
-        $paths[''] = GEMS_PROJECT_PATH . '/' . strtolower(self::EVENTS_DIR . 's/' . $eventType);
+        $paths[''] = APPLICATION_PATH . '/' . strtolower(self::EVENTS_DIR . 's/' . $eventType);
         // MUtil_Echo::track($paths);
 
         return $paths;
@@ -290,7 +290,7 @@
     {
         return $this->_loadEvent($eventName, self::SURVEY_DISPLAY_EVENT);
     }
-    
+
     /**
      *
      * @param string $eventName

Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php	2012-11-22 15:59:49 UTC (rev 1037)
+++ trunk/library/classes/GemsEscort.php	2012-11-22 17:29:49 UTC (rev 1038)
@@ -39,8 +39,6 @@
 // $autoloader->registerNamespace has not yet run!!
 include_once('MUtil/Application/Escort.php');
 
-// mb_internal_encoding('UTF-8');
-
 /**
  * Project Application Core code
  *
@@ -588,9 +586,11 @@
                 );  // tooltip
                 $contactDiv->a($menuItem->toHRefAttribute(), $menuItem->get('label'));
 
-                $ul = $menuItem->toUl();
-                $ul->class = 'dropdownContent tooltip';
-                $contactDiv->append($ul);
+                // List may be empty
+                if ($ul = $menuItem->toUl()) {
+                    $ul->class = 'dropdownContent tooltip';
+                    $contactDiv->append($ul);
+                }
 
                 return $contactDiv;
             }
@@ -1731,7 +1731,7 @@
         $front               = $this->frontController;
         $controllerFileName  = $front->getDispatcher()->getControllerClass($request) . '.php';
 
-        // MUtil_Echo::r(GEMS_PROJECT_PATH . '/controllers/' . $controllerFileName);
+        // MUtil_Echo::r(APPLICATION_PATH . '/controllers/' . $controllerFileName);
 
         // Set to project path if that controller exists
         // TODO: Dirs & modules combineren.

Modified: trunk/library/pre_bootstrap.php
===================================================================
--- trunk/library/pre_bootstrap.php	2012-11-22 15:59:49 UTC (rev 1037)
+++ trunk/library/pre_bootstrap.php	2012-11-22 17:29:49 UTC (rev 1038)
@@ -55,7 +55,7 @@
 defined('APPLICATION_PATH') || define('APPLICATION_PATH', GEMS_ROOT_DIR . '/application');
 
 /**
- * Compatibility
+ * Compatibility, remove in 1.6
  */
 define('GEMS_PROJECT_PATH', APPLICATION_PATH);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.