X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUpdate.php;h=e5ee587dc1ca5adfa4a2d21d4712638ce55034fd;hb=dfcfae6bcca54a27b1bf5099d96d54f2bba997d3;hp=8da473839d553ec8e844324a15fb4e9dbab2ce8e;hpb=0f91d1cbde9e36b10d66fe756229ec8a9635f7eb;p=friendica.git

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 8da473839d..e5ee587dc1 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -54,7 +54,7 @@ class Update
 		}
 
 		// Don't check the status if the last update was failed
-		if (DI::config()->get('system', 'update', Update::SUCCESS, true) == Update::FAILED) {
+		if (DI::config()->get('system', 'update', Update::SUCCESS) == Update::FAILED) {
 			return;
 		}
 
@@ -119,7 +119,7 @@ class Update
 			DI::lock()->release('dbupdate', true);
 		}
 
-		$build = DI::config()->get('system', 'build', null, true);
+		$build = DI::config()->get('system', 'build', null);
 
 		if (empty($build) || ($build > DB_UPDATE_VERSION)) {
 			$build = DB_UPDATE_VERSION - 1;
@@ -132,7 +132,7 @@ class Update
 			$stored = intval($build);
 			$current = intval(DB_UPDATE_VERSION);
 			if ($stored < $current || $force) {
-				DI::config()->load('database');
+				DI::config()->reload();
 
 				// Compare the current structure with the defined structure
 				// If the Lock is acquired, never release it automatically to avoid double updates
@@ -141,7 +141,7 @@ class Update
 					Logger::notice('Update starting.', ['from' => $stored, 'to' => $current]);
 
 					// Checks if the build changed during Lock acquiring (so no double update occurs)
-					$retryBuild = DI::config()->get('system', 'build', null, true);
+					$retryBuild = DI::config()->get('system', 'build', null);
 					if ($retryBuild !== $build) {
 						Logger::notice('Update already done.', ['from' => $stored, 'to' => $current]);
 						DI::lock()->release('dbupdate');
@@ -160,9 +160,10 @@ class Update
 							Logger::warning('Pre update failed', ['version' => $version]);
 							DI::config()->set('system', 'update', Update::FAILED);
 							DI::lock()->release('dbupdate');
-							DI::config()->set('system', 'maintenance', false, false);
-							DI::config()->delete('system', 'maintenance_reason', false);
-							DI::config()->save();
+							DI::config()->beginTransaction()
+										->set('system', 'maintenance', false)
+										->delete('system', 'maintenance_reason')
+										->commit();
 							return $r;
 						} else {
 							Logger::notice('Pre update executed.', ['version' => $version]);
@@ -182,9 +183,10 @@ class Update
 						Logger::error('Update ERROR.', ['from' => $stored, 'to' => $current, 'retval' => $retval]);
 						DI::config()->set('system', 'update', Update::FAILED);
 						DI::lock()->release('dbupdate');
-						DI::config()->set('system', 'maintenance', false, false);
-						DI::config()->delete('system', 'maintenance_reason', false);
-						DI::config()->save();
+						DI::config()->beginTransaction()
+									->set('system', 'maintenance', false)
+									->delete('system', 'maintenance_reason')
+									->commit();
 						return $retval;
 					} else {
 						Logger::notice('Database structure update finished.', ['from' => $stored, 'to' => $current]);
@@ -200,9 +202,10 @@ class Update
 							Logger::warning('Post update failed', ['version' => $version]);
 							DI::config()->set('system', 'update', Update::FAILED);
 							DI::lock()->release('dbupdate');
-							DI::config()->set('system', 'maintenance', false, false);
-							DI::config()->delete('system', 'maintenance_reason', false);
-							DI::config()->save();
+							DI::config()->beginTransaction()
+										->set('system', 'maintenance', false)
+										->delete('system', 'maintenance_reason')
+										->commit();
 							return $r;
 						} else {
 							DI::config()->set('system', 'build', $version);
@@ -213,9 +216,10 @@ class Update
 					DI::config()->set('system', 'build', $current);
 					DI::config()->set('system', 'update', Update::SUCCESS);
 					DI::lock()->release('dbupdate');
-					DI::config()->set('system', 'maintenance', false, false);
-					DI::config()->delete('system', 'maintenance_reason',  false);
-					DI::config()->save();
+					DI::config()->beginTransaction()
+								->set('system', 'maintenance', false)
+								->delete('system', 'maintenance_reason')
+								->commit();
 
 					Logger::notice('Update success.', ['from' => $stored, 'to' => $current]);
 					if ($sendMail) {