[frio] Prevent unwanted textaera resizing in comment forms

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index caf2026348fd9ff74f29978c9765e1b5a33a902c..b9e22dd1b53034d036adee442967045eb1591e98 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -13,7 +13,6 @@ use Friendica\Core\Config\ConfigCacheLoader;
 use Friendica\Database\DBA;
 use Friendica\Factory\ConfigFactory;
 use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Util\BasePath;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -194,7 +193,7 @@ class App
                $this->logger   = $logger;
                $this->basePath = $this->config->get('system', 'basepath');
 
-               if (!BasePath::isDirectoryUsable($this->basePath, false)) {
+               if (!Core\System::isDirectoryUsable($this->basePath, false)) {
                        throw new Exception('Basepath ' . $this->basePath . ' isn\'t usable.');
                }
                $this->basePath = rtrim($this->basePath, DIRECTORY_SEPARATOR);
@@ -375,7 +374,7 @@ class App
                        $adapterType = $this->config->get('system', 'config_adapter');
                        $adapter = ConfigFactory::createConfig($adapterType, $this->config);
                        Core\Config::setAdapter($adapter);
-                       $adapterP = ConfigFactory::createConfig($adapterType, $this->config);
+                       $adapterP = ConfigFactory::createPConfig($adapterType, $this->config);
                        Core\PConfig::setAdapter($adapterP);
                        Core\Config::load();
                }
@@ -387,7 +386,7 @@ class App
                        Core\Hook::loadHooks();
                        $loader = new ConfigCacheLoader($this->basePath);
                        Core\Hook::callAll('load_config', $loader);
-                       $this->config->loadConfigArray($loader->loadAddonConfig(), true);
+                       $this->config->loadConfigArray($loader->loadCoreConfig('addon'), true);
                }
 
                $this->loadDefaultTimezone();
@@ -664,8 +663,6 @@ class App
                        '$local_user'      => local_user(),
                        '$generator'       => 'Friendica' . ' ' . FRIENDICA_VERSION,
                        '$delitem'         => Core\L10n::t('Delete this item?'),
-                       '$showmore'        => Core\L10n::t('show more'),
-                       '$showfewer'       => Core\L10n::t('show fewer'),
                        '$update_interval' => $interval,
                        '$shortcut_icon'   => $shortcut_icon,
                        '$touch_icon'      => $touch_icon,
@@ -1288,7 +1285,7 @@ class App
                        $this->module = 'maintenance';
                } else {
                        $this->checkURL();
-                       Core\Update::check(false);
+                       Core\Update::check($this->basePath, false);
                        Core\Addon::loadAddons();
                        Core\Hook::loadHooks();
                }