X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=82b184c9f4c1dc791fe759329632482bfaa37cb3;hb=979199c4426159035cca5245cee8e92fd7478fc5;hp=06287516fa5250f30172e5c23d9c02f819f48543;hpb=2ec3a97393959e42d450e074271d2d622d25701f;p=friendica.git

diff --git a/update.php b/update.php
index 06287516fa..82b184c9f4 100644
--- a/update.php
+++ b/update.php
@@ -54,29 +54,6 @@ use Friendica\Model\Storage;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Worker\Delivery;
 
-function update_1178()
-{
-	require_once 'mod/profiles.php';
-
-	$profiles = q("SELECT `uid`, `about`, `locality`, `pub_keywords`, `gender` FROM `profile` WHERE `is-default`");
-
-	foreach ($profiles as $profile) {
-		if ($profile["about"].$profile["locality"].$profile["pub_keywords"].$profile["gender"] == "") {
-			continue;
-		}
-
-		$profile["pub_keywords"] = profile_clean_keywords($profile["pub_keywords"]);
-
-		$r = q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
-			DBA::escape($profile["about"]),
-			DBA::escape($profile["locality"]),
-			DBA::escape($profile["pub_keywords"]),
-			DBA::escape($profile["gender"]),
-			intval($profile["uid"])
-		);
-	}
-}
-
 function update_1179()
 {
 	if (DI::config()->get('system', 'no_community_page')) {
@@ -115,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
@@ -153,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);
@@ -161,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);
@@ -379,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;