From 1045a57fc877d529579c5121059f20699482f1dc Mon Sep 17 00:00:00 2001 From: Chris Chabot Date: Mon, 11 May 2009 11:08:49 +0000 Subject: [PATCH] Fixed a small issue when data pipelining == null on proxied content views git-svn-id: https://svn.apache.org/repos/asf/incubator/shindig/trunk@773523 13f79535-47bb-0310-9956-ffa450edef68 --- php/src/gadgets/templates/DataPipelining.php | 32 +++++++++++++++------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/php/src/gadgets/templates/DataPipelining.php b/php/src/gadgets/templates/DataPipelining.php index 8e327242..9f9ff0f0 100644 --- a/php/src/gadgets/templates/DataPipelining.php +++ b/php/src/gadgets/templates/DataPipelining.php @@ -76,23 +76,25 @@ class DataPipelining { */ static public function fetch($dataPipeliningRequests, GadgetContext $context, $dataContext = array()) { $result = array(); - do { - // See which requests we can batch together, that either don't use dynamic tags or who's tags are resolvable - $requestQueue = array(); - foreach ($dataPipeliningRequests as $key => $request) { - if (($resolved = self::resolveRequest($request, $result)) !== false) { - $requestQueue[] = $resolved; - unset($dataPipeliningRequests[$key]); + if (is_array($dataPipeliningRequests) && count($dataPipeliningRequests)) { + do { + // See which requests we can batch together, that either don't use dynamic tags or who's tags are resolvable + $requestQueue = array(); + foreach ($dataPipeliningRequests as $key => $request) { + if (($resolved = self::resolveRequest($request, $result)) !== false) { + $requestQueue[] = $resolved; + unset($dataPipeliningRequests[$key]); + } } - } - if (count($requestQueue)) { - $returnedResults = self::performRequests($requestQueue, $context); - if (is_array($returnedResults)) { - $dataContext = self::addResultToContext($returnedResults, $dataContext); - $result = array_merge($returnedResults, $result); + if (count($requestQueue)) { + $returnedResults = self::performRequests($requestQueue, $context); + if (is_array($returnedResults)) { + $dataContext = self::addResultToContext($returnedResults, $dataContext); + $result = array_merge($returnedResults, $result); + } } - } - } while (count($requestQueue)); + } while (count($requestQueue)); + } return $result; } -- 2.11.4.GIT