Merge pull request #329 from marian-kadanka/fix-319-ajax-endpoint-url-again

hyyan · web-flow · commit f9e7209a79ac · 2018-04-30T20:38:26.000+02:00
Fix Ajax endpoint URL again, fixes #319
diff --git a/src/Hyyan/WPI/Ajax.php b/src/Hyyan/WPI/Ajax.php
@@ -25,19 +25,22 @@ class Ajax
      */
     public function __construct()
     {
-        add_filter('pll_home_url_white_list', array( $this, 'pll_home_url_white_list' ));
+        add_filter('woocommerce_ajax_get_endpoint', array($this, 'filter_woocommerce_ajax_get_endpoint'), 10, 2);
     }
 
     /**
-     * Add WooCommerce class-wc-ajax.php to the Polylang home_url white list
+     * Filter woocommerce_ajax_get_endpoint URL - replace the path part 
+     * with the correct relative home URL according to the current language 
+     * and append the query string
      *
-     * @param array $white_list Polylang home_url white list
+     * @param string $url WC AJAX endpoint URL to filter
+     * @param string $request
      *
-     * @return array filtered white list
+     * @return string filtered WC AJAX endpoint URL
      */
-    public function pll_home_url_white_list($white_list)
+    public function filter_woocommerce_ajax_get_endpoint($url, $request)
     {
-        $white_list[] = array( 'file' => 'class-wc-ajax.php' );
-        return $white_list;
+        global $polylang;
+        return parse_url($polylang->filters_links->links->get_home_url($polylang->curlang), PHP_URL_PATH) . '?' . parse_url($url, PHP_URL_QUERY);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,19 +25,22 @@ class Ajax`
`25`	`25`	`*/`
`26`	`26`	`public function __construct()`
`27`	`27`	`{`
`28`		`- add_filter('pll_home_url_white_list', array( $this, 'pll_home_url_white_list' ));`
	`28`	`+ add_filter('woocommerce_ajax_get_endpoint', array($this, 'filter_woocommerce_ajax_get_endpoint'), 10, 2);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`		`- * Add WooCommerce class-wc-ajax.php to the Polylang home_url white list`
	`32`	`+ * Filter woocommerce_ajax_get_endpoint URL - replace the path part`
	`33`	`+ * with the correct relative home URL according to the current language`
	`34`	`+ * and append the query string`
`33`	`35`	`*`
`34`		`- * @param array $white_list Polylang home_url white list`
	`36`	`+ * @param string $url WC AJAX endpoint URL to filter`
	`37`	`+ * @param string $request`
`35`	`38`	`*`
`36`		`- * @return array filtered white list`
	`39`	`+ * @return string filtered WC AJAX endpoint URL`
`37`	`40`	`*/`
`38`		`- public function pll_home_url_white_list($white_list)`
	`41`	`+ public function filter_woocommerce_ajax_get_endpoint($url, $request)`
`39`	`42`	`{`
`40`		`- $white_list[] = array( 'file' => 'class-wc-ajax.php' );`
`41`		`- return $white_list;`
	`43`	`+ global $polylang;`
	`44`	`+ return parse_url($polylang->filters_links->links->get_home_url($polylang->curlang), PHP_URL_PATH) . '?' . parse_url($url, PHP_URL_QUERY);`
`42`	`45`	`}`
`43`	`46`	`}`