Removed some DI references

diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index 109adac4e984e3ef19dedd53477eb6aa695f5ff7..9513e839b605ca91eb201dcaa0dcdde2c6b4bd54 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -116,10 +116,10 @@ class WCFACP extends WCF {
         * @see \wcf\system\WCF::initSession()
         */
        protected function initSession() {
-               $factory = self::$diContainer->get(ACPSessionFactory::class);
+               $factory = new ACPSessionFactory();
                $factory->load();
                
-               self::$sessionObj = self::$diContainer->get(SessionHandler::class);
+               self::$sessionObj = SessionHandler::getInstance();
        }
        
        /**

diff --git a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php
index cd1eda6277d114fd28ae95d9d67ca7de09b22417..afeb514efd3127eaf54ee64c84b35ef3069fbd9b 100644 (file)
--- a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php
+++ b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php
@@ -25,11 +25,6 @@ class LanguageFactory extends SingletonFactory {
         */
        protected $cache = null;
        
-       /**
-        * @var LanguageCacheBuilder
-        */
-       protected $languageCacheBuilder;
-       
        /**
         * initialized languages
         * @var Language[]
@@ -42,17 +37,6 @@ class LanguageFactory extends SingletonFactory {
         */
        protected $scriptingCompiler = null;
        
-       /**
-        * LanguageFactory constructor.
-        * 
-        * @param       LanguageCacheBuilder    $languageCacheBuilder
-        */
-       public function __construct(LanguageCacheBuilder $languageCacheBuilder) {
-               $this->languageCacheBuilder = $languageCacheBuilder;
-               
-               parent::__construct();
-       }
-       
        /**
         * @see SingletonFactory::init()
         */
@@ -232,7 +216,7 @@ class LanguageFactory extends SingletonFactory {
         */
        protected function loadCache() {
                if (defined('WCF_N')) {
-                       $this->cache = $this->languageCacheBuilder->getData();
+                       $this->cache = LanguageCacheBuilder::getInstance()->getData();
                }
        }
        
@@ -240,7 +224,7 @@ class LanguageFactory extends SingletonFactory {
         * Clears languages cache.
         */
        public function clearCache() {
-               $this->languageCacheBuilder->reset();
+               LanguageCacheBuilder::getInstance()->reset();
        }
        
        /**