CSRF protection in user registration

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

diff --git a/lib/action.php b/lib/action.php
index 5f452616618db48453cb009ac514469e007dfad9..8f72b542b05214c2e68429d2326727749c8b185f 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -26,6 +26,10 @@ class Action { // lawsuit
        function Action() {
        }
 
+       function is_readonly() {
+               return false;
+       }
+
        function arg($key, $def=NULL) {
                if (array_key_exists($key, $this->args)) {
                        return $this->args[$key];
@@ -55,7 +59,7 @@ class Action { // lawsuit
                } else {
                        return $def;
                }
-       }
+       }       
 
        function server_error($msg, $code=500) {
                $action = $this->trimmed('action');
@@ -80,9 +84,9 @@ class Action { // lawsuit
         $action = $this->trimmed('action');
         common_element_start('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
-            common_menu_item(common_local_url($menuaction),
-                                                        _($menudesc[0]),
-                                                        _($menudesc[1]),
+            common_menu_item(common_local_url($menuaction, isset($menudesc[2]) ? $menudesc[2] : NULL),
+                                                        $menudesc[0],
+                                                        $menudesc[1],
                                                         $action == $menuaction);
         }
         common_element_end('ul');