From: Hypolite Petovan <ben.lort@gmail.com>
Date: Fri, 7 Oct 2016 00:58:28 +0000 (-0400)
Subject: Merge remote-tracking branch 'refs/remotes/origin/develop' into Issue-#2816-2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=645fd414d5c5b8f4aa7214e413e77b7e34b1d54d;p=friendica.git

Merge remote-tracking branch 'refs/remotes/origin/develop' into Issue-#2816-2
---

645fd414d5c5b8f4aa7214e413e77b7e34b1d54d
diff --cc include/dbstructure.php
index d3b148b2a8,32d5986fe9..d287b5e6d9
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@@ -1512,11 -1491,24 +1513,27 @@@ function dbstructure_run(&$argv, &$argc
  
  	if ($argc==2) {
  		switch ($argv[1]) {
 +			case "dryrun":
 +				update_structure(true, false);
 +				return;
  			case "update":
  				update_structure(true, true);
+ 
+ 				$build = get_config('system','build');
+ 				if (!x($build)) {
+ 					set_config('system','build',DB_UPDATE_VERSION);
+ 					$build = DB_UPDATE_VERSION;
+ 				}
+ 
+ 				$stored = intval($build);
+ 				$current = intval(DB_UPDATE_VERSION);
+ 
+ 				// run any left update_nnnn functions in update.php
+ 				for($x = $stored; $x < $current; $x ++) {
+ 					$r = run_update_function($x);
+ 					if (!$r) break;
+ 				}
+ 
  				set_config('system','build',DB_UPDATE_VERSION);
  				return;
  			case "dumpsql":