Fix feed rewrite uri in case of custom permalink + generate empty fil…

…e when no products founds
BeAPI · Jun 9, 2020 · ba083ab · ba083ab
1 parent 4ae0a1b
commit ba083ab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/Feed/Generator.php b/src/Feed/Generator.php
@@ -116,10 +116,6 @@ public function render( $no_cache = false ) {
 	public function generate() {
 		$products_list = Products::get_instance()->get_list();
 
-		if ( empty( $products_list ) ) {
-			return new WP_Error( 'shopping_feed_generation_error_no_product', 'No product to export' );
-		}
-
 		try {
 			$this->generator->write( $products_list );
 			$uri = Uri::get_full_path();

diff --git a/src/ShoppingFeed.php b/src/ShoppingFeed.php
@@ -207,8 +207,8 @@ public static function activate() {
 		if ( defined( 'WC_VERSION' ) ) {
 			Actions::register_feed_generation();
 			Actions::register_get_orders();
-			flush_rewrite_rules();
 		}
+		flush_rewrite_rules();
 	}
 
 	/**
@@ -221,8 +221,8 @@ public static function deactivate() {
 		if ( defined( 'WC_VERSION' ) ) {
 			Actions::clean_feed_generation();
 			Actions::clean_get_orders();
-			flush_rewrite_rules();
 		}
+		flush_rewrite_rules();
 	}
 
 	/**

diff --git a/src/ShoppingFeedHelper.php b/src/ShoppingFeedHelper.php
@@ -77,7 +77,8 @@ public static function get_feed_filename() {
 	 * @return string
 	 */
 	public static function get_public_feed_endpoint() {
-		return Rewrite::FEED_PARAM;
+		global $wp_rewrite;
+		return $wp_rewrite->root . Rewrite::FEED_PARAM;
 	}
 
 	/**

diff --git a/src/Url/Rewrite.php b/src/Url/Rewrite.php
@@ -35,9 +35,11 @@ public function __construct() {
 	 * Add new pretty url to getting the feed
 	 */
 	public function sf_add_custom_rewrite_rule() {
+		global $wp_rewrite;
 		$endpoint = ShoppingFeedHelper::get_public_feed_endpoint();
+		$regex = '^' . $wp_rewrite->root . $endpoint . '$';
 		add_rewrite_rule(
-			"$endpoint$",
+			$regex,
 			array( self::FEED_PARAM => true ),
 			'top'
 		);