Merged pervious commit to 1.8.

git-svn-id: http://code.elgg.org/elgg/trunk@6754 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index 57da1389fe6a523da355fe3f8e413efde8c68c90..b715577a9a54156f3a94b3c3db7b743b8406c9f1 100644 (file)
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -124,9 +124,15 @@ function actions_init($event, $object_type, $object) {
  *
  * @return unknown
  */
-function validate_action_token($visibleerrors = true) {
-       $token = get_input('__elgg_token');
-       $ts = get_input('__elgg_ts');
+function validate_action_token($visibleerrors = TRUE, $token = NULL, $ts = NULL) {
+       if (!$token) {
+               $token = get_input('__elgg_token');
+       }
+
+       if (!$ts) {
+               $ts = get_input('__elgg_ts');
+       }
+
        $session_id = session_id();
 
        if (($token) && ($ts) && ($session_id)) {