Renamed getInstance() to getSelfInstance(), conflicts BaseRegistry versus several...

[shipsimu.git] / application / selector / exceptions.php

diff --git a/application/selector/exceptions.php b/application/selector/exceptions.php
index fd41c37727663bfd3d5e82c4f31870119eaa3f99..1184f43a503023a7e1da2e0897aa2580de3404cf 100644 (file)
--- a/application/selector/exceptions.php
+++ b/application/selector/exceptions.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0

- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team

  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -25,9 +25,9 @@
 // Our own exception handler
 function __exceptionHandler (FrameworkException $e) {
        // Call the app_die() method
 // Our own exception handler
 function __exceptionHandler (FrameworkException $e) {
        // Call the app_die() method

-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to a thrown exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
-               ApplicationHelper::getInstance()->getAppName(),
-               ApplicationHelper::getInstance()->getAppShortName(),
+       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to an uncaught exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
+               ApplicationHelper::getSelfInstance()->getAppName(),
+               ApplicationHelper::getSelfInstance()->getAppShortName(),

                $e->__toString(),
                $e->getHexCode(),
                $e->getMessage(),
                $e->__toString(),
                $e->getHexCode(),
                $e->getMessage(),