From a362b308c05350821cc2920e3c758db790515af3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 20 Mar 2015 14:10:06 +0100 Subject: [PATCH] bugfix update addon, no new classes found --- classes/rex_asd_news_config.php | 6 +++++- update.inc.php | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/classes/rex_asd_news_config.php b/classes/rex_asd_news_config.php index b62be43..faec60a 100644 --- a/classes/rex_asd_news_config.php +++ b/classes/rex_asd_news_config.php @@ -63,7 +63,11 @@ public static function addSaveConfigs(array $list) */ public static function saveConfig() { - $config = array_merge(self::$defaultConfig, self::$config, self::$saveConfig); + $config = array_merge( + (array)self::$defaultConfig, + (array)self::$config, + (array)self::$saveConfig + ); self::$config = $config; diff --git a/update.inc.php b/update.inc.php index 9319d08..ab1ca3e 100644 --- a/update.inc.php +++ b/update.inc.php @@ -2,7 +2,8 @@ global $REX; -include_once rex_path::addon('asd_news', 'classes/rex_asd_news_config.php'); +include_once __DIR__ . '/classes/rex_asd_news_config.php'; + rex_asd_news_config::init( 'asd_news', 'asd_news', // Without Prefix @@ -38,7 +39,7 @@ if (OOAddon::isAvailable('metainfo') && $metaCols) { - include_once rex_path::addon(rex_asd_news_config::getName(), 'classes/metainfo/rex_asd_metainfo_install.php'); + include_once __DIR__ . '/classes/metainfo/rex_asd_metainfo_install.php'; rex_asd_metainfo_install::setProperty(); if ($error = rex_asd_metainfo_install::addFields()) {