X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=88b89cda27ac60189375854ecca2a103439ff4d2;hb=31d47ade784c080e15626305e7cc49be85ee67b6;hp=98ae3da2d9ce14876f439b8995febdd19ff1fe35;hpb=6cf50a14fae25210a0cdb617c29d549abcfde9ac;p=friendica.git
diff --git a/src/Core/System.php b/src/Core/System.php
index 98ae3da2d9..88b89cda27 100644
--- 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
-
- System Unavailable
- Apologies but this site is unavailable at the moment. Please try again later.
-
-EOT;
-
- killme();
- }
-
/**
* Generic XML return
* Outputs a basic dfrn XML status structure to STDOUT, with a variable
@@ -212,7 +198,10 @@ EOT;
*/
public static function processID($prefix)
{
- return uniqid($prefix . ':' . str_pad(getmypid() . ':', 8, '0') . ':');
+ // We aren't calling any other function here.
+ // Doing so could easily create an endless loop
+ $trailer = $prefix . ':' . getmypid() . ':';
+ return substr($trailer . uniqid('') . mt_rand(), 0, 26);
}
/// @todo Move the following functions from boot.php