svn commit: r796582 - /incubator/shindig/trunk/php/src/gadgets/GadgetFactory.php

[chabotc]

Author: chabotc
Date: Tue Jul 21 23:37:58 2009
New Revision: 796582

URL: http://svn.apache.org/viewvc?rev=796582&view=rev
Log:
Synced up the preloading format with the javascript code

Modified:
    incubator/shindig/trunk/php/src/gadgets/GadgetFactory.php

Modified: incubator/shindig/trunk/php/src/gadgets/GadgetFactory.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/GadgetFactory.php?rev=796582&r1=796581&r2=796582&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/GadgetFactory.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/GadgetFactory.php Tue Jul 21 
23:37:58 2009
@@ -107,8 +107,8 @@
       }
     }
     // Apply substitutions to the preloads
-    foreach ($gadget->gadgetSpec->preloads as $url => $preload) {
-      $gadget->gadgetSpec->preloads[$url]['body'] = 
$gadget->substitutions->substitute($preload['body']);
+    foreach ($gadget->gadgetSpec->preloads as $key  => $preload) {
+      $gadget->gadgetSpec->preloads[$key]['body'] = 
$gadget->substitutions->substitute($preload['body']);
     }
   }
 
@@ -260,7 +260,7 @@
     $preloads = array();
     foreach ($gadget->gadgetSpec->preloads as $key => $preload) {
       if (!empty($preload['href']) && isset($responses[$preload['href']]) && 
$responses[$preload['href']]['rc'] == 200) {
-        $preloads[$preload['href']] = $responses[$preload['href']];
+        $preloads[] = array_merge(array('id' => $preload['href']), 
$responses[$preload['href']]);
       }
     }
     $gadget->gadgetSpec->preloads = $preloads;