version 2.7.5 released

Author: manchumahara

.github/workflows/deploy.yml

@@ -7,9 +7,8 @@ on:
 
 jobs:
   tag:
-    name: Deploy Plugin Tag
+    name: New tag
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
 
@@ -24,79 +23,105 @@ jobs:
       - name: Find Readme File
         id: find_readme
         run: |
-          readme_file=$(find . -type f -iname "readme.*" | head -n 1)
-          if [ -n "$readme_file" ]; then
-            echo "Readme file found: $readme_file"
-            echo "readme_file=$readme_file" >> $GITHUB_ENV
-          else
+          for file in readme.txt Readme.txt README.txt README.md Readme.md readme.md; do
+            if [ -f "$file" ]; then
+              echo "Readme file found: $file"
+              echo "readme_file=$file" >> $GITHUB_ENV
+              break
+            fi
+          done
+
+          # Ensure the variable is available within the current step
+          source $GITHUB_ENV
+
+          if [ -z "$readme_file" ]; then
             echo "::error::Readme file not found."
             exit 1
           fi
 
       - name: Extract Release Notes
         id: release_notes
         run: |
-          # Define variables
           changelog_section_start="== Changelog =="
-          current_tag="${{ github.ref_name }}"
-          readme_file="${{ env.readme_file }}"
+          readme_file="$readme_file"
 
-          # Extract version from tag (strip 'refs/tags/' if it exists)
-          version=${current_tag#refs/tags/}
+          # Extract the tag name from GITHUB_REF (plugin_version)
+          if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+            plugin_version="${GITHUB_REF#refs/tags/}"
+            echo "DEBUG: Plugin latest version found: $plugin_version."
+          else
+            echo "::error::This workflow must be triggered by a tag push."
+            exit 1
+          fi
 
-          # Initialize variables
           in_changelog=0
-          capturing_version=0
+          found_version=0
           release_notes=""
 
+          echo "DEBUG: Starting to extract release notes from $readme_file for version $plugin_version."
+
           while IFS= read -r line; do
-            # Start capturing after finding the changelog section
+            echo "DEBUG: Processing line: $line"
+
+            # Start processing after the changelog header
             if [[ "$line" == "$changelog_section_start" ]]; then
               in_changelog=1
+              echo "DEBUG: Found changelog section header."
               continue
             fi
 
-            # Skip lines before the changelog section
+            # Skip if not in changelog section
             if [[ $in_changelog -eq 0 ]]; then
+              echo "DEBUG: Skipping line (not in changelog section)."
               continue
             fi
 
-            # Start capturing if the line matches the current version
-            if [[ "$line" == "= $version =" ]]; then
-              capturing_version=1
-              release_notes+="$line\n"
+            # Check for the current version header
+            if [[ "$line" == "= ${plugin_version} =" ]]; then
+              found_version=1
+              echo "DEBUG: Found version header for $plugin_version."
               continue
             fi
 
-            # Stop capturing when a new version is detected
-            if [[ $capturing_version -eq 1 && "$line" =~ ^= ]]; then
+            # Break if a new version header is found after the current version
+            if [[ $found_version -eq 1 ]] && echo "$line" | grep -qE '^= [0-9]+\.[0-9]+\.[0-9]+ =$'; then
+              echo "DEBUG: Found a new version header. Stopping collection."
               break
             fi
 
-            # Add the line to the release notes if we are capturing
-            if [[ $capturing_version -eq 1 ]]; then
-              release_notes+="$line\n"
+            # Collect lines starting with '*' if we are in the current version section
+            if [[ $found_version -eq 1 ]] && echo "$line" | grep -qE '^\*'; then
+              echo "DEBUG: Found changelog entry: $line"
+              release_notes+="${line}\n"
+              continue
+            fi
+
+            # Log skipped lines in the current version section
+            if [[ $found_version -eq 1 ]]; then
+              echo "DEBUG: Skipping line (not a changelog entry): $line"
             fi
           done < "$readme_file"
 
-          # Check if release notes were extracted
           if [[ -z "$release_notes" ]]; then
-            echo "::error::Failed to extract release notes for version $version."
+            echo "::error::Failed to extract release notes for version ${plugin_version}."
             exit 1
           fi
 
-          # Debug: Print extracted release notes
-          echo "Extracted release notes for version $version:"
-          printf "%b" "$release_notes"
-
-          # Set output for release notes
-          echo "::set-output name=notes::$(printf "%b" "$release_notes")"
-
-      - name: Debug Release Notes
-        run: |
-          echo "Debugging Release Notes:"
-          echo "${{ steps.release_notes.outputs.notes }}"
-
+          echo "DEBUG: Successfully extracted release notes."
+          echo "DEBUG: Release notes content:"
+          echo -e "$release_notes"
+
+          # Write the release notes with actual line breaks
+          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
+          echo -e "$release_notes" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV           
+
+      #- name: Deploy WordPress.org Assets
+      #  uses: 10up/action-wordpress-plugin-asset-update@stable              
+      #  env:
+      #    SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+      #    SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+          
       - name: WordPress Plugin Deploy
         id: deploy
         uses: 10up/action-wordpress-plugin-deploy@stable
@@ -107,7 +132,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.ref_name }}
-          body: ${{ steps.release_notes.outputs.notes }}
+          body: ${{ env.RELEASE_NOTES }}
           files: ${{github.workspace}}/${{ github.event.repository.name }}.zip
 
 env:

assets/css/wpnextpreviouslink-admin.css

@@ -452,8 +452,8 @@
                 $('.wpnpcustomimg').addClass('hidden');
                 $('.wpnpaddon_custom_img').addClass('hidden');
 
-                $('#wpnp_previousimg').attr('src', wpnp.image_url + 'l_' + imagename + '.png');
-                $('#wpnp_nextimg').attr('src', wpnp.image_url + 'r_' + imagename + '.png');
+                $('#wpnp_previousimg').attr('src', wpnextpreviouslink_settings_vars.image_url + 'l_' + imagename + '.png');
+                $('#wpnp_nextimg').attr('src', wpnextpreviouslink_settings_vars.image_url + 'r_' + imagename + '.png');
             }
         });
 

assets/css/wpnextpreviouslink-setting.css

@@ -28,6 +28,42 @@ function wpnextpreviouslink_template_path() {
  *
  * @return string
  */
+/*function wpnextpreviouslink_locate_template2( $template_name, $template_path = '', $default_path = '' ) {
+	if ( ! $template_path ) {
+		$template_path = wpnextpreviouslink_template_path();
+	}
+
+	if ( ! $default_path ) {
+		$default_path = WPNEXTPREVIOUSLINK_ROOT_PATH . 'templates/';
+	}
+
+	// Look within passed path within the theme - this is priority.
+	$template = locate_template( [ wpnextpreviouslink - tpl - loader . phptrailingslashit( $template_path ) . $template_name, $template_name ] );
+
+	// Get default template/.
+	if ( ! $template ) {
+		$template = $default_path . $template_name;
+	}
+
+	// Return what we found.
+	return apply_filters( 'wpnextpreviouslink_locate_template', $template, $template_name, $template_path );
+}//end function wpnextpreviouslink_locate_template2*/
+
+/**
+ * Locate a template and return the path for inclusion.
+ *
+ * This is the load order:
+ *
+ * yourtheme/$template_path/$template_name
+ * yourtheme/$template_name
+ * $default_path/$template_name
+ *
+ * @param string $template_name Template name.
+ * @param string $template_path Template path. (default: '').
+ * @param string $default_path Default path. (default: '').
+ *
+ * @return string
+ */
 function wpnextpreviouslink_locate_template( $template_name, $template_path = '', $default_path = '' ) {
 	if ( ! $template_path ) {
 		$template_path = wpnextpreviouslink_template_path();
@@ -38,7 +74,12 @@ function wpnextpreviouslink_locate_template( $template_name, $template_path = ''
 	}
 
 	// Look within passed path within the theme - this is priority.
-	$template = locate_template( [ trailingslashit( $template_path ) . $template_name, $template_name ] );
+	$template = locate_template(
+		[
+			trailingslashit( $template_path ) . $template_name,
+			$template_name,
+		]
+	);
 
 	// Get default template/.
 	if ( ! $template ) {
@@ -47,7 +88,7 @@ function wpnextpreviouslink_locate_template( $template_name, $template_path = ''
 
 	// Return what we found.
 	return apply_filters( 'wpnextpreviouslink_locate_template', $template, $template_name, $template_path );
-}//end function wpnextpreviouslink_locate_template
+} //end function wpnextpreviouslink_locate_template
 
 /**
  * Get other templates (e.g. product attributes) passing attributes and including the file.
@@ -82,7 +123,7 @@ function wpnextpreviouslink_get_template( $template_name, $args = [], $template_
 }//end function wpnextpreviouslink_get_template
 
 /**
- * Like wc_get_template, but returns the HTML instead of outputting.
+ * Likewpnextpreviouslink_get_template, but returns the HTML instead of outputting.
  *
  * @param  string  $template_name  Template name.
  * @param  array  $args  Arguments. (default: array).
@@ -92,7 +133,7 @@ function wpnextpreviouslink_get_template( $template_name, $args = [], $template_
  * @return string
  * @since 2.5.0
  *
- * @see   wc_get_template
+ * @see  wpnextpreviouslink_get_template
  */
 function wpnextpreviouslink_get_template_html( $template_name, $args = [], $template_path = '', $default_path = '' ) {
 	ob_start();