Merge branch 'openid-plugin' into 'nightly'

[quix0rs-gnu-social.git] / lib / form.php

diff --git a/lib/form.php b/lib/form.php
index 74737f6df5c12953dbc6f71f0bfd90358f499971..fcccb9c7524b4f4f78f4a5f35ec91842923485ec 100644 (file)
--- a/lib/form.php
+++ b/lib/form.php
@@ -91,7 +91,9 @@ class Form extends Widget
 
     function sessionToken()
     {
-        $this->out->hidden('token', common_session_token());
+        if (strtolower($this->method()) == 'post') {
+            $this->out->hidden('token-' . $this->id() ?: common_random_hexstr(3), common_session_token(), 'token');
+        }
     }
 
     /**
@@ -188,9 +190,9 @@ class Form extends Widget
         return 'form';
     }
 
-    function li()
+    function li($class=null)
     {
-        $this->out->elementStart('li');
+        $this->out->elementStart('li', $class);
     }
 
     function unli()