diff --git a/boot.php b/boot.php index 7a54f2d5a..733bbfd6a 100644 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'Asparagus'); define('FRIENDICA_VERSION', '3.6-dev'); define('DFRN_PROTOCOL_VERSION', '2.23'); -define('DB_UPDATE_VERSION', 1246); +define('DB_UPDATE_VERSION', 1247); define('NEW_UPDATE_ROUTINE_VERSION', 1170); /** diff --git a/src/Core/Addon.php b/src/Core/Addon.php index af3d843a9..b1f401d28 100644 --- a/src/Core/Addon.php +++ b/src/Core/Addon.php @@ -4,10 +4,9 @@ */ namespace Friendica\Core; -use Friendica\App; use Friendica\Core\Config; -use Friendica\Core\System; use Friendica\Database\DBM; + use dba; require_once 'include/dba.php'; @@ -83,7 +82,7 @@ class Addon if (strlen($addons)) { $r = dba::select('addon', [], ['installed' => 1]); if (DBM::is_result($r)) { - $installed = $r; + $installed = dba::inArray($r); } else { $installed = []; } diff --git a/update.php b/update.php index 273e75de7..bc14b3a29 100644 --- a/update.php +++ b/update.php @@ -7,6 +7,8 @@ use Friendica\Core\Worker; use Friendica\Database\DBM; use Friendica\Model\User; +require_once 'include/dba.php'; + /** * * update.php - automatic system update @@ -173,3 +175,12 @@ function update_1245() { return UPDATE_SUCCESS; } + +function update_1247() { + // Removing hooks with the old name + dba::e("DELETE FROM `hook` +WHERE `hook` LIKE 'plugin_%'"); + + // Make sure we install the new renamed ones + Addon::reload(); +}