and another one

[friendica.git/.git] / update.php

diff --git a/update.php b/update.php
index 49a220b..82b184c 100644 (file)
--- a/update.php
+++ b/update.php
@@ -92,23 +92,7 @@ function update_1191()
        DI::config()->set('system', 'maintenance', 1);
 
        if (Addon::isEnabled('forumlist')) {
-               $addon = 'forumlist';
-               $addons = DI::config()->get('system', 'addon');
-               $addons_arr = [];
-
-               if ($addons) {
-                       $addons_arr = explode(",", str_replace(" ", "", $addons));
-
-                       $idx = array_search($addon, $addons_arr);
-                       if ($idx !== false) {
-                               unset($addons_arr[$idx]);
-                               //delete forumlist manually from addon and hook table
-                               // since Addon::uninstall() don't work here
-                               q("DELETE FROM `addon` WHERE `name` = 'forumlist' ");
-                               q("DELETE FROM `hook` WHERE `file` = 'addon/forumlist/forumlist.php' ");
-                               DI::config()->set('system', 'addon', implode(", ", $addons_arr));
-                       }
-               }
+               Addon::uninstall('forumlist');
        }
 
        // select old formlist addon entries
@@ -130,7 +114,7 @@ function update_1191()
 
                        if ($key === 'show_on_profile') {
                                if ($value) {
-                                       DI::pConfig()->set($uid, feature, forumlist_profile, $value);
+                                       DI::pConfig()->set($uid, 'feature', 'forumlist_profile', $value);
                                }
 
                                DI::pConfig()->delete($uid, $family, $key);
@@ -138,7 +122,7 @@ function update_1191()
 
                        if ($key === 'show_on_network') {
                                if ($value) {
-                                       DI::pConfig()->set($uid, feature, forumlist_widget, $value);
+                                       DI::pConfig()->set($uid, 'feature', 'forumlist_widget', $value);
                                }
 
                                DI::pConfig()->delete($uid, $family, $key);
@@ -356,7 +340,7 @@ function update_1309()
 
                $deliver_options = ['priority' => PRIORITY_MEDIUM, 'dont_fork' => true];
                Worker::add($deliver_options, 'Delivery', Delivery::POST, $item['id'], $entry['cid']);
-               Logger::info('Added delivery worker', ['command' => $cmd, 'item' => $item['id'], 'contact' => $entry['cid']]);
+               Logger::info('Added delivery worker', ['item' => $item['id'], 'contact' => $entry['cid']]);
                DBA::delete('queue', ['id' => $entry['id']]);
        }
        return Update::SUCCESS;