Merge branch '5.4'
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 13 Aug 2021 09:00:24 +0000 (11:00 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 13 Aug 2021 09:00:24 +0000 (11:00 +0200)
1  2 
com.woltlab.wcf/templates/accountManagement.tpl
wcfsetup/install/files/lib/data/DatabaseObject.class.php
wcfsetup/install/lang/de.xml

index 5f22458b019b8d4f9fdce2891132b1668991f02a,602a635eb5089f7d24f05650ecf83c2af76d5871..dca654de36072a15016b90b010da34d3447eb0b6
@@@ -203,12 -203,13 +203,13 @@@ abstract class DatabaseObject implement
              return static::$databaseTableIndexName;
          }
  
-         static $databaseTableIndexName = null;
-         if ($databaseTableIndexName === null) {
-             $className = \explode('\\', static::class);
 -        $className = \get_called_class();
++        $className = static::class;
+         static $databaseTableIndexNames = [];
+         if (!isset($databaseTableIndexNames[$className])) {
+             $classParts = \explode('\\', $className);
              $parts = \preg_split(
                  '~(?=[A-Z](?=[a-z]))~',
-                 \array_pop($className),
+                 \array_pop($classParts),
                  -1,
                  \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY
              );
Simple merge