From 19277946b643c7024c1aaad813f287bead695f21 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Sun, 2 Oct 2011 19:00:29 -0700
Subject: Merged fixes for delayed queries from 1.7.

---
 engine/lib/database.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'engine/lib/database.php')

diff --git a/engine/lib/database.php b/engine/lib/database.php
index 7747eb0d5..f12b50079 100644
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -163,10 +163,17 @@ function db_delayedexecution_shutdown_hook() {
 	global $DB_DELAYED_QUERIES;
 
 	foreach ($DB_DELAYED_QUERIES as $query_details) {
-		// use one of our db functions so it is included in profiling.
-		$result = execute_query($query_details['q'], $query_details['l']);
-
 		try {
+			$link = $query_details['l'];
+
+			if ($link == 'read' || $link == 'write') {
+				$link = get_db_link($link);
+			} elseif (!is_resource($link)) {
+				elgg_log("Link for delayed query not valid resource or db_link type. Query: {$query_details['q']}", 'WARNING');
+			}
+			
+			$result = execute_query($query_details['q'], $link);
+			
 			if ((isset($query_details['h'])) && (is_callable($query_details['h']))) {
 				$query_details['h']($result);
 			}
@@ -272,7 +279,7 @@ function execute_query($query, $dblink) {
  * the raw result from {@link mysql_query()}.
  *
  * @param string   $query   The query to execute
- * @param resource $dblink  The database link to use
+ * @param resource $dblink  The database link to use or the link type (read | write)
  * @param string   $handler A callback function to pass the results array to
  *
  * @return true
@@ -284,6 +291,10 @@ function execute_delayed_query($query, $dblink, $handler = "") {
 		$DB_DELAYED_QUERIES = array();
 	}
 
+	if (!is_resource($dblink) && $dblink != 'read' && $dblink != 'write') {
+		return false;
+	}
+
 	// Construct delayed query
 	$delayed_query = array();
 	$delayed_query['q'] = $query;
@@ -306,7 +317,7 @@ function execute_delayed_query($query, $dblink, $handler = "") {
  * @uses get_db_link()
  */
 function execute_delayed_write_query($query, $handler = "") {
-	return execute_delayed_query($query, get_db_link('write'), $handler);
+	return execute_delayed_query($query, 'write', $handler);
 }
 
 /**
@@ -320,7 +331,7 @@ function execute_delayed_write_query($query, $handler = "") {
  * @uses get_db_link()
  */
 function execute_delayed_read_query($query, $handler = "") {
-	return execute_delayed_query($query, get_db_link('read'), $handler);
+	return execute_delayed_query($query, 'read', $handler);
 }
 
 /**
-- 
cgit v1.2.3