We now can show "Friendica (AP)" as network name

[friendica.git] / src / Core / System.php

diff --git a/src/Core/System.php b/src/Core/System.php
index 4e2b63f044bbb2ae30ee374924671bf37c3f040e..b41f520d7792c614414cda5701ab8e8ab3ee22ed 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;
@@ -161,6 +161,18 @@ class System extends BaseObject
                killme();
        }
 
+       /**
+        * Generates a random string in the UUID format
+        *
+        * @param bool|string  $prefix   A given prefix (default is empty)
+        * @return string a generated UUID
+        */
+       public static function createUUID($prefix = '')
+       {
+               $guid = System::createGUID(32, $prefix);
+               return substr($guid, 0, 8). '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12);
+       }
+
        /**
         * Generates a GUID with the given parameters
         *