Changeset 29771

Timestamp:

Sep 24, 2014, 12:57:57 PM (10 years ago)

Author:

plg

Message:

merge r29770 from trunk to branch 2.7

bug 3145: generate the pwg_token at the right time, not at prefilter time

File:

• branches/2.7/plugins/TakeATour/main.inc.php (modified) (1 diff)

branches/2.7/plugins/TakeATour/main.inc.php

@@ -105 +105 @@
 {
   $search = '<div class="bigButton"><a href="{$next_step_url}">{\'I want to add photos\'|@translate}</a></div>';
-  $replacement = '<div class="bigButton"><a href="'.get_root_url().'admin.php?submited_tour_path=tours/first_contact&pwg_token='.get_pwg_token().'">{\'Start the Tour\'|@translate}</a></div>';
+  $replacement = '<div class="bigButton"><a href="{$F_ACTION}?submited_tour_path=tours/first_contact&pwg_token={$pwg_token}">{\'Start the Tour\'|@translate}</a></div>';
   return(str_replace($search, $replacement, $content));
 }