Moved addon directory constant

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 1118280a53e4bd0ca02394394a36e1fdc173d56f..e217cf87519174f4c5bd06c067dcedbcc7044186 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -12,6 +12,12 @@ use Friendica\Database\DBA;
  */
 class Addon extends BaseObject
 {
+       /**
+        * The addon sub-directory
+        * @var string
+        */
+       const DIRECTORY = '/addon/';
+
        /**
         * List of the names of enabled addons
         *

diff --git a/src/Core/Config/ConfigCacheLoader.php b/src/Core/Config/ConfigCacheLoader.php
index 4f595bc1c42a0b01bbe3f44ea0ca926734c2c70c..58647e5aec032474eb795b5df8e1b9c9865acabb 100644 (file)
--- a/src/Core/Config/ConfigCacheLoader.php
+++ b/src/Core/Config/ConfigCacheLoader.php
@@ -2,6 +2,8 @@
 
 namespace Friendica\Core\Config;
 
+use Friendica\Core\Addon;
+
 /**
  * The ConfigCacheLoader loads config-files and stores them in a ConfigCache ( @see ConfigCache )
  *
@@ -17,11 +19,6 @@ class ConfigCacheLoader
         * @var string
         */
        const SUBDIRECTORY   = '/config/';
-       /**
-        * The addon sub-directory
-        * @var string
-        */
-       const ADDONDIRECTORY = '/addon/';
 
        private $baseDir;
        private $configDir;
@@ -141,7 +138,7 @@ class ConfigCacheLoader
        public function loadConfigFile($filename, $addon = false)
        {
                if ($addon) {
-                       $filepath = $this->baseDir . self::ADDONDIRECTORY . $filename . self::SUBDIRECTORY . $filename . ".config.php";
+                       $filepath = $this->baseDir . Addon::DIRECTORY . $filename . self::SUBDIRECTORY . $filename . ".config.php";
                } else {
                        $filepath = $this->configDir . $filename . ".config.php";
                }