Reorganize Protocol constants

[friendica.git] / src / Core / System.php
diff --git a/src/Core/System.php b/src/Core/System.php

index e3dc4e5870d96309d2cc0e74dfc2c583568ea8df..88b89cda27ac60189375854ecca2a103439ff4d2 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -65,7 +65,7 @@ class System extends BaseObject
                 while ($func = array_pop($trace)) {
                         if (!empty($func['class'])) {
                                 // Don't show multiple calls from the "dba" class to show the essential parts of the callstack
-                               if ((($previous['class'] != $func['class']) || ($func['class'] != 'dba')) && ($previous['function'] != 'q')) {
+                               if ((($previous['class'] != $func['class']) || ($func['class'] != 'Friendica\Database\DBA')) && ($previous['function'] != 'q')) {
                                         $classparts = explode("\\", $func['class']);
                                         $callstack[] = array_pop($classparts).'::'.$func['function'];
                                         $previous = $func;
@@ -85,20 +85,6 @@ class System extends BaseObject
                 return implode(', ', $callstack2);
         }
  
-       /**
-        * @brief Called from db initialisation when db is dead.
-        */
-       static public function unavailable() {
-echo <<< EOT
-<html>
-       <head><title>System Unavailable</title></head>
-       <body>Apologies but this site is unavailable at the moment. Please try again later.</body>
-</html>
-EOT;
-
-               killme();
-       }
-
         /**
          * Generic XML return
          * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable