From 4b82e47034b6847bc4ccf72dfae1703d99f0b2b8 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 4 Feb 2019 09:33:55 +0100
Subject: [PATCH] Moved addon directory constant

---
 src/Core/Addon.php                    | 6 ++++++
 src/Core/Config/ConfigCacheLoader.php | 9 +++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 1118280a53..e217cf8751 100644
--- 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 4f595bc1c4..58647e5aec 100644
--- 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";
 		}