Merge pull request #26 from threadi/fix/fixedUsageOfAmpersandInAJAX

fixed usage of ampersand in AJAX
threadi · Mar 6, 2024 · 4852091 · 4852091
2 parents b28d1a4 + ac69640
commit 4852091
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/admin/js.js b/admin/js.js
@@ -20,15 +20,15 @@ jQuery(document).ready(function($) {
         // get button as object
         let button_obj = $(this);
 
-        // get field value
+        // get field value.
         let urls = $(this).parent().find('.eml_add_external_files').val();
 
         // do nothing if list is empty.
         if( urls.length === 0 ) {
           return;
         }
 
-        // send request
+        // send request.
         jQuery.ajax({
             url: emlJsVars.ajax_url,
             type: 'post',

diff --git a/inc/admin.php b/inc/admin.php
@@ -430,6 +430,7 @@ function eml_admin_add_urls_via_ajax(): void {
 		$files  = array();
 		foreach ( $url_array as $url ) {
 			if ( ! empty( $url ) ) {
+				$url = str_replace( '&amp;', '&', $url );
 				if ( ! $files_obj->add_file( $url ) ) {
 					$errors[] = $url;
 				} else {

diff --git a/readme.txt b/readme.txt
@@ -73,3 +73,4 @@ No, only public files can be used.
 
 = 1.1.2 =
 * Fixed possible error during check for current screen
+* Fixed usage of URLs with ampersand on AJAX-request
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,3 +73,4 @@ No, only public files can be used.

		= 1.1.2 =
		* Fixed possible error during check for current screen
		* Fixed usage of URLs with ampersand on AJAX-request