From 04c8b35ee4a82a6fdb3b7e4495c25f04ac852422 Mon Sep 17 00:00:00 2001
From: Frey Mansikkaniemi <frey@asiaweb.invite.hk>
Date: Mon, 31 Aug 2020 09:05:08 +0000
Subject: [PATCH] Output QR Code at an earlier stage to avoid Wordpress
 outputting some garbage first.

---
 hong-kong-fps-woo-payment.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/hong-kong-fps-woo-payment.php b/hong-kong-fps-woo-payment.php
index 58092f0..16e3a15 100644
--- a/hong-kong-fps-woo-payment.php
+++ b/hong-kong-fps-woo-payment.php
@@ -52,25 +52,15 @@ function its_wpf_add_class( $methods ){
     return $methods;
 }
 
-/**
- * Reqister query var for qrcode image generation
- */
-
-add_filter( 'query_vars', 'its_wpf_qrcode_add_var' );
-function its_wpf_qrcode_add_var( $vars )
-{
-    $vars[] = 'generate_fps_qrcode';
-    return $vars;
-}
 
 /**
  * Print out qr code when the right query var is found
  */
 
-add_action( 'template_redirect', 'its_wpf_qrcode_catch', 5 );
+add_action( 'init', 'its_wpf_qrcode_catch', 0 );
 function its_wpf_qrcode_catch()
 {   
-    $qrcode_string = get_query_var( 'generate_fps_qrcode' );
+    $qrcode_string = $_REQUEST['generate_fps_qrcode'];
     $nonce = $_REQUEST['_wpnonce'];
     if( $qrcode_string && $nonce && wp_verify_nonce( $nonce, ITS_WPF_PLUGIN_ID ) )
     {