From d691c2e6211f903d6382f7d6784fc3886c277e08 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 30 Sep 2017 16:45:35 +0000
Subject: [PATCH] Database structure call is now executed directly when it
 cannot be called via proc_run

---
 boot.php   | 21 ++++++++++++++-------
 update.php |  5 -----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/boot.php b/boot.php
index ba692405a6..8e80bd4124 100644
--- a/boot.php
+++ b/boot.php
@@ -599,7 +599,10 @@ function check_db() {
 		$build = DB_UPDATE_VERSION;
 	}
 	if ($build != DB_UPDATE_VERSION) {
-		proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php');
+		// When we cannot execute the database update via the worker, we will do it directly
+		if (!proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php')) {
+			update_db(get_app());
+		}
 	}
 }
 
@@ -1024,6 +1027,8 @@ function get_max_import_size() {
  *
  * @hooks 'proc_run'
  * 	array $arr
+ *
+ * @return boolean "false" if proc_run couldn't be executed
  */
 function proc_run($cmd) {
 
@@ -1033,7 +1038,7 @@ function proc_run($cmd) {
 
 	$args = array();
 	if (!count($proc_args)) {
-		return;
+		return false;
 	}
 
 	// Preserve the first parameter
@@ -1059,7 +1064,7 @@ function proc_run($cmd) {
 
 	call_hooks("proc_run", $arr);
 	if (!$arr['run_cmd'] || ! count($args)) {
-		return;
+		return true;
 	}
 
 	$priority = PRIORITY_MEDIUM;
@@ -1088,7 +1093,7 @@ function proc_run($cmd) {
 
 	// Quit if there was a database error - a precaution for the update process to 3.5.3
 	if (dba::errorNo() != 0) {
-		return;
+		return false;
 	}
 
 	if (!$found) {
@@ -1097,12 +1102,12 @@ function proc_run($cmd) {
 
 	// Should we quit and wait for the poller to be called as a cronjob?
 	if ($dont_fork) {
-		return;
+		return true;
 	}
 
 	// If there is a lock then we don't have to check for too much worker
 	if (!Lock::set('poller_worker', 0)) {
-		return;
+		return true;
 	}
 
 	// If there are already enough workers running, don't fork another one
@@ -1110,13 +1115,15 @@ function proc_run($cmd) {
 	Lock::remove('poller_worker');
 
 	if ($quit) {
-		return;
+		return true;
 	}
 
 	// Now call the poller to execute the jobs that we just added to the queue
 	$args = array("include/poller.php", "no_cron");
 
 	$a->proc_run($args);
+
+	return true;
 }
 
 function current_theme() {
diff --git a/update.php b/update.php
index f6f79dac1e..b0046f17a7 100644
--- a/update.php
+++ b/update.php
@@ -1729,8 +1729,3 @@ function update_1202() {
 	$r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
 		dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP));
 }
-
-function update_1231() {
-	// For this special case we have to use the old update routine
-	$r = q("ALTER TABLE `workerqueue` ADD `done` tinyint(1) NOT NULL DEFAULT 0");
-}