svn commit: r670733 - /incubator/shindig/trunk/php/src/gadgets/GadgetServer.php

[chabotc]

Author: chabotc
Date: Mon Jun 23 13:18:53 2008
New Revision: 670733

URL: http://svn.apache.org/viewvc?rev=670733&view=rev
Log:
SHINDIG-339 fixes Substitutionsin Preloads

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

Modified: incubator/shindig/trunk/php/src/gadgets/GadgetServer.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/GadgetServer.php?rev=670733&r1=670732&r2=670733&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/GadgetServer.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/GadgetServer.php Mon Jun 23 
13:18:53 2008
@@ -130,8 +130,6 @@
                $substitutor->addSubstitution('BIDI', "DIR", $rtl ? "rtl" : 
"ltr");
                $substitutor->addSubstitution('BIDI', "REVERSE_DIR", $rtl ? 
"ltr" : "rtl");
                
-               $this->substitutePreloads($gadget, $substitutor);
-               
                // userPref's
                $upValues = $gadget->getUserPrefValues();
                foreach ($gadget->getUserPrefs() as $pref) {
@@ -143,9 +141,11 @@
                        if ($value == null) {
                                $value = "";
                        }
-                       $substitutor->addSubstitution('USER_PREF', $name, 
$value);
+                       $substitutor->addSubstitution('UP', $name, $value);
                }
                
+               $this->substitutePreloads($gadget, $substitutor);
+               
                // Process required / desired features
                $requires = $gadget->getRequires();
                $needed = array();