Author: chabotc
Date: Sat Mar 7 12:52:42 2009
New Revision: 751258
URL: http://svn.apache.org/viewvc?rev=751258&view=rev
Log:
Rolling back the patch from SHINDIG-966, was breaking makeRequest
Modified:
incubator/shindig/trunk/php/src/gadgets/GadgetContext.php
Modified: incubator/shindig/trunk/php/src/gadgets/GadgetContext.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/GadgetContext.php?rev=751258&r1=751257&r2=751258&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/GadgetContext.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/GadgetContext.php Sat Mar 7
12:52:42 2009
@@ -18,8 +18,6 @@
* under the License.
*/
-
-
/*
* GadgetContext contains all contextual variables and classes that are
relevant for this request,
* such as url, httpFetcher, feature registry, etc.
@@ -275,6 +273,9 @@
if (! isset($token) || $token == '') {
$token = isset($_POST['st']) ? $_POST['st'] : '';
}
+ if (count(explode(':', $token)) != 6) {
+ $token = urldecode(base64_decode($token));
+ }
if (empty($token)) {
throw new Exception("Missing or invalid security token");
}