Double-quotes rewritten to single-quotes

diff --git a/application/selector/data.php b/application/selector/data.php
index bc4cc7e85bd171477b1fc8413311335183a22806..45876a318946174e275c33473f21118fb71ba489 100644 (file)
--- a/application/selector/data.php
+++ b/application/selector/data.php
@@ -30,7 +30,7 @@ $cfg = FrameworkConfiguration::getInstance();
 
 // Get an instance of the helper
 $app = call_user_func_array(
-       array($cfg->readConfig('app_helper_class'), "getInstance"),
+       array($cfg->readConfig('app_helper_class'), 'getInstance'),
        array()
 );
 

diff --git a/application/selector/starter.php b/application/selector/starter.php
index 706684cafc3410bedd787b329a6114aa33f84ebe..e4ede0ee1abfb18f00c240d6a1c21610fd493517 100644 (file)
--- a/application/selector/starter.php
+++ b/application/selector/starter.php
@@ -24,7 +24,7 @@
 
 // Is there an application helper instance? We need the method main() for
 // maining the application
-$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), "getInstance"), array());
+$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), 'getInstance'), array());
 
 // Some sanity checks
 if ((empty($app)) || (is_null($app))) {

diff --git a/application/ship-simu/data.php b/application/ship-simu/data.php
index 3396d44b013b9a5abd339a1af5a54e5b991349e0..893b124146678cebcd0c5f65083fe95cac1287d7 100644 (file)
--- a/application/ship-simu/data.php
+++ b/application/ship-simu/data.php
@@ -38,7 +38,7 @@ $cfg = FrameworkConfiguration::getInstance();
 
 // Get an instance of the helper
 $app = call_user_func_array(
-       array($cfg->readConfig('app_helper_class'), "getInstance"),
+       array($cfg->readConfig('app_helper_class'), 'getInstance'),
        array()
 );
 

diff --git a/application/ship-simu/main/menu/class_ShipSimu b/application/ship-simu/main/menu/class_ShipSimu
index 44fcbb0cd2b6948bf44d1b2e027a31b67c58f601..eac52e3c4c86d7d17ad2def69374bfdb182fd060 100644 (file)
--- a/application/ship-simu/main/menu/class_ShipSimu
+++ b/application/ship-simu/main/menu/class_ShipSimu
@@ -35,16 +35,12 @@ class ShipSimu???Menu extends BaseMenu implements RenderableMenu {
        /**
         * Creates an instance of this class
         *
-        * @param       $appInstance    A manageable application instance
         * @return      $menuInstance   An instance of this class
         */
-       public final static function createShipSimu???Menu (ManageableApplication $appInstance) {
+       public final static function createShipSimu???Menu () {
                // Get a new instance
                $menuInstance = new ShipSimu???Menu();
 
-               // Set the app instance
-               $menuInstance->setApplicationInstance($appInstance);
-
                // Return the prepared instance
                return $menuInstance;
        }

diff --git a/application/ship-simu/main/menu/class_ShipSimuHomeMenu.php b/application/ship-simu/main/menu/class_ShipSimuHomeMenu.php
index 3b129e6525943ff79051b014386bbfecabade8a5..0987058db3b6da0c6658a637cd72876cd91bca51 100644 (file)
--- a/application/ship-simu/main/menu/class_ShipSimuHomeMenu.php
+++ b/application/ship-simu/main/menu/class_ShipSimuHomeMenu.php
@@ -35,16 +35,12 @@ class ShipSimuHomeMenu extends BaseMenu implements RenderableMenu {
        /**
         * Creates an instance of this class
         *
-        * @param       $appInstance    A manageable application instance
         * @return      $menuInstance   An instance of this class
         */
-       public final static function createShipSimuHomeMenu (ManageableApplication $appInstance) {
+       public final static function createShipSimuHomeMenu () {
                // Get a new instance
                $menuInstance = new ShipSimuHomeMenu();
 
-               // Set the app instance
-               $menuInstance->setApplicationInstance($appInstance);
-
                // Return the prepared instance
                return $menuInstance;
        }

diff --git a/application/ship-simu/starter.php b/application/ship-simu/starter.php
index 3a3038b7ee85155c8fa1faa5adb5eabdfdb943f9..d73db4b1b0f34564a2c447c08d4fe5dfe36085b9 100644 (file)
--- a/application/ship-simu/starter.php
+++ b/application/ship-simu/starter.php
@@ -24,7 +24,7 @@
 
 // Is there an application helper instance? We need the method main() for
 // maining the application
-$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), "getInstance"), array());
+$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), 'getInstance'), array());
 
 // Some sanity checks
 if ((empty($app)) || (is_null($app))) {

diff --git a/application/ship-simu/templates/de/code/shipsimu_main.ctp b/application/ship-simu/templates/de/code/shipsimu_main.ctp
index 8fc74046c2f1a78fd5a45cabdba566e4b5f9eb61..a298102203c51335380238f5dd5dacd174916d46 100644 (file)
--- a/application/ship-simu/templates/de/code/shipsimu_main.ctp
+++ b/application/ship-simu/templates/de/code/shipsimu_main.ctp
@@ -4,8 +4,8 @@
        {?ship_simu_header?}
 </div>
 
-<div id="navigation">
-       {?navigation?}
+<div id="menu">
+       {?menu?}
 </div>
 
 <div id="advert">