Fixed a few issues

Fixes #961

diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
index 78ca5f55a75c8c2c3b4b61b22b47c1fb152cf6a2..6576e6ddf4fe7ff39c58a0d44054d134c8806b04 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
@@ -34,7 +34,7 @@ class UserGroupAddForm extends AbstractOptionListForm {
        /**
         * @see wcf\acp\form\AbstractOptionListForm::$cacheName
         */
-       public $cacheName = 'userGroup-option';
+       public $cacheName = 'userGroupOption';
        
        /**
         * option tree

diff --git a/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php b/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php
index 250707e727858b79751d0c5dd1e84e5eaea17c5e..dddf9eea8ba8b70a9ff964513761c241d21c9f11 100644 (file)
--- a/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php
+++ b/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php
@@ -1,6 +1,5 @@
 <?php
 namespace wcf\system\benchmark;
-use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
 use wcf\util\FileUtil;
 
@@ -58,10 +57,6 @@ class Benchmark extends SingletonFactory {
         */
        public function start($text, $type = self::TYPE_OTHER) {
                $newIndex = count($this->items);
-               if ($newIndex == 200) {
-                       throw new SystemException("Infinite loop detected, aborting.");
-               }
-               
                $this->items[$newIndex]['text'] = $text;
                $this->items[$newIndex]['type'] = $type;
                $this->items[$newIndex]['before'] = self::getMicrotime();

diff --git a/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php
index 269c991379b0ed513c4fb7ec12db770c9bbcac87..79a83e65a8a8be5796129d68da6a1ad9ac3080f0 100644 (file)
--- a/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php
@@ -52,6 +52,7 @@ class ApplicationCacheBuilder implements ICacheBuilder {
                // assign wcf pseudo-application
                if (PACKAGE_ID) {
                        $data['wcf'] = $data['application'][1];
+                       unset($data['application'][1]);
                }
                
                return $data;