Merge pull request #1345 from equalizedigital/release/1.37.0

Release v1.37.0

Author: pattonwebz

.github/workflows/lint-php.yml

@@ -73,4 +73,10 @@ jobs:
           github-token: ${{ secrets.PUBLIC_REPO_ACCESS }}
 
       - name: Lint against parse errors
+        id: lint_with_cs2pr
         run: composer lint -- --checkstyle | cs2pr
+        continue-on-error: true
+
+      - name: Lint against parse errors (fallback without cs2pr)
+        if: steps.lint_with_cs2pr.outcome == 'failure'
+        run: composer lint

accessibility-checker.php

@@ -10,7 +10,7 @@
  * Plugin Name:       Accessibility Checker
  * Plugin URI:        https://a11ychecker.com
  * Description:       Audit and check your website for accessibility before you hit publish. In-post accessibility scanner and guidance.
- * Version:           1.36.0
+ * Version:           1.37.0
  * Requires PHP:      7.4
  * Author:            Equalize Digital
  * Author URI:        https://equalizedigital.com
@@ -36,12 +36,12 @@
 
 // Current plugin version.
 if ( ! defined( 'EDAC_VERSION' ) ) {
-	define( 'EDAC_VERSION', '1.36.0' );
+	define( 'EDAC_VERSION', '1.37.0' );
 }
 
 // Current database version.
 if ( ! defined( 'EDAC_DB_VERSION' ) ) {
-	define( 'EDAC_DB_VERSION', '1.0.4' );
+	define( 'EDAC_DB_VERSION', '1.0.5' );
 }
 
 // Plugin Folder Path.

admin/class-ajax.php

@@ -540,10 +540,10 @@ function ( $a, $b ) {
 						$html .= ( true === $ignore_permission || ! empty( $ignore_comment ) ) ? '<label for="edac-details-rule-records-record-ignore-comment-' . $id . '">Comment</label><br>' : '';
 						$html .= ( true === $ignore_permission || ! empty( $ignore_comment ) ) ? '<textarea rows="4" class="edac-details-rule-records-record-ignore-comment" id="edac-details-rule-records-record-ignore-comment-' . $id . '" ' . $ignore_comment_disabled . '>' . $ignore_comment . '</textarea>' : '';
 
-						if ( $ignore_global ) {
-							$html .= ( true === $ignore_permission ) ? '<a href="' . admin_url( 'admin.php?page=accessibility_checker_ignored&tab=global' ) . '" class="edac-details-rule-records-record-ignore-global">Manage Globally Ignored</a>' : '';
+						if ( $ignore_global && edac_is_pro() ) {
+							$html .= ( true === $ignore_permission ) ? '<a href="' . admin_url( 'admin.php?page=accessibility_checker_ignored&tab=global' ) . '" class="edac-details-rule-records-record-ignore-global">' . __( 'Manage Globally Ignored', 'accessibility-checker' ) . '</a>' : '';
 						} else {
-							$html .= ( true === $ignore_permission ) ? '<button class="edac-details-rule-records-record-ignore-submit" data-id=' . $id . ' data-action=' . $ignore_action . ' data-type=' . $ignore_type . '>' . EDAC_SVG_IGNORE_ICON . ' <span class="edac-details-rule-records-record-ignore-submit-label">' . $ignore_submit_label . '<span></button>' : '';
+							$html .= ( true === $ignore_permission ) ? '<button class="edac-details-rule-records-record-ignore-submit" data-id="' . $id . '" data-action="' . $ignore_action . '" data-type="' . $ignore_type . '">' . EDAC_SVG_IGNORE_ICON . ' <span class="edac-details-rule-records-record-ignore-submit-label">' . $ignore_submit_label . '</span></button>' : '';
 						}
 
 						$html .= ( false === $ignore_permission && false === $ignore ) ? __( 'Your user account doesn\'t have permission to ignore this issue.', 'accessibility-checker' ) : '';

admin/class-frontend-highlight.php

@@ -61,7 +61,7 @@ public function get_issues( $post_id ) {
 		$table_name = $wpdb->prefix . 'accessibility_checker';
 		$post_id    = (int) $post_id;
 		$siteid     = get_current_blog_id();
-		$results    = $wpdb->get_results( $wpdb->prepare( 'SELECT id, rule, ignre, object, ruletype FROM %i where postid = %d and siteid = %d', $table_name, $post_id, $siteid ), ARRAY_A ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching -- Safe variable used for table name.
+		$results    = $wpdb->get_results( $wpdb->prepare( 'SELECT id, rule, ignre, object, ruletype, selector, ancestry, xpath FROM %i where postid = %d and siteid = %d', $table_name, $post_id, $siteid ), ARRAY_A ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching -- Safe variable used for table name.
 		if ( ! $results ) {
 			return null;
 		}
@@ -136,6 +136,9 @@ public function ajax() {
 			$array['object']     = html_entity_decode( $result['object'], ENT_QUOTES | ENT_HTML5 );
 			$array['id']         = $result['id'];
 			$array['ignored']    = $result['ignre'];
+			$array['selector']   = $result['selector'] ?? '';
+			$array['ancestry']   = $result['ancestry'] ?? '';
+			$array['xpath']      = $result['xpath'] ?? '';
 
 			$issues[] = $array;
 

admin/class-insert-rule-data.php

@@ -12,6 +12,14 @@
 /**
  * Class for inserting rule data into the database
  *
+ * The unique identifier for issues changed in version 1.0.5 of the database schema.
+ * Previously, issues were identified by: postid + rule + object + type + siteid
+ * Now, issues are identified by: postid + rule + selector + type + siteid
+ *
+ * This change allows duplicate code objects (e.g., two empty paragraphs) to be
+ * stored as separate issues when they appear in different locations on the page.
+ * The selector field provides the unique location identifier for each issue.
+ *
  * @since 1.10.0
  */
 class Insert_Rule_Data {
@@ -73,15 +81,17 @@ public function insert( object $post, string $rule, string $ruletype, string $ru
 		}
 
 		// Check if exists.
+		// Use selector as the unique identifier instead of object to allow duplicate code objects
+		// with different selectors (e.g., two empty paragraphs in different locations).
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching -- Using direct query for adding data to database, caching not required for one time operation.
 		$results = $wpdb->get_results(
 			$wpdb->prepare(
-				'SELECT postid, ignre FROM %i where type = %s and postid = %d and rule = %s and object = %s and siteid = %d',
+				'SELECT postid, ignre FROM %i where type = %s and postid = %d and rule = %s and selector = %s and siteid = %d',
 				$table_name,
 				$rule_data['type'],
 				$rule_data['postid'],
 				$rule_data['rule'],
-				$rule_data['object'],
+				$rule_data['selector'],
 				$rule_data['siteid']
 			),
 			ARRAY_A
@@ -97,22 +107,23 @@ public function insert( object $post, string $rule, string $ruletype, string $ru
 				}
 
 				// update existing record.
+				// Use selector for WHERE clause instead of object to match on unique identifier.
 				// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching -- Using direct query for adding data to database, caching not required for one time operation.
 				$wpdb->query(
 					$wpdb->prepare(
-						'UPDATE %i SET recordcheck = %d, landmark = %s, landmark_selector = %s, selector = %s, ancestry = %s, xpath = %s, ignre = %d  WHERE siteid = %d and postid = %d and rule = %s and object = %s and type = %s',
+						'UPDATE %i SET recordcheck = %d, landmark = %s, landmark_selector = %s, object = %s, ancestry = %s, xpath = %s, ignre = %d  WHERE siteid = %d and postid = %d and rule = %s and selector = %s and type = %s',
 						$table_name,
 						1,
 						$rule_data['landmark'],
 						$rule_data['landmark_selector'],
-						$rule_data['selector'],
+						$rule_data['object'],
 						$rule_data['ancestry'],
 						$rule_data['xpath'],
 						$rule_data['ignre'],
 						$rule_data['siteid'],
 						$rule_data['postid'],
 						$rule_data['rule'],
-						$rule_data['object'],
+						$rule_data['selector'],
 						$rule_data['type']
 					)
 				);

admin/class-update-database.php

@@ -74,9 +74,38 @@ public function edac_update_database() {
 			require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 			dbDelta( $sql );
 
+			// Run migration for selector-based unique identifiers if upgrading from older versions.
+			if ( version_compare( $db_version, '1.0.5', '<' ) ) {
+				$this->migrate_to_selector_based_unique_id();
+			}       
 		}
 
 		// Update database version option.
 		update_option( 'edac_db_version', sanitize_text_field( EDAC_DB_VERSION ) );
 	}
+
+	/**
+	 * Migrate existing records to use selector-based unique identifiers.
+	 *
+	 * This migration handles records that were created before the selector field
+	 * was used as the unique identifier. Records with NULL selectors will have
+	 * a fallback identifier generated based on their ID to ensure uniqueness.
+	 *
+	 * @since 1.0.5
+	 * @return void
+	 */
+	private function migrate_to_selector_based_unique_id() {
+		global $wpdb;
+		$table_name = $wpdb->prefix . 'accessibility_checker';
+
+		// Find records with NULL or empty selectors and update them with a fallback value.
+		// Using the record ID ensures each record has a unique selector for backward compatibility.
+		// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching -- One-time migration query.
+		$wpdb->query(
+			$wpdb->prepare(
+				"UPDATE %i SET selector = CONCAT('legacy-id-', id) WHERE selector IS NULL OR selector = ''",
+				$table_name
+			)
+		);
+	}
 }

changelog.txt

@@ -1,6 +1,15 @@
 *** Accessibility Checker ***
 
-2025-15-22 - version 1.36.0
+2026-01-23 - version 1.37.0
+* Fix - Duplicate markup on the page can now be properly identified as an issue.
+* Fix - Restrict global ignore management link and fix button label span closure.
+* Fix - Update database schema to use selector as unique identifier for issues.
+* Enhanced - Frontend issue matching with stable selectors and DOM ordering.
+* Enhanced - Better handling of frontend highlighter positioning.
+* Improved - More accurate restoration of styles after deactivating them in frontend highlighter.
+* Improved - When closing frontend highlighter it won't re-render unless needed.
+
+2025-12-15 - version 1.36.0
 * Fix - passed tests percentage logic now accounts times no posts are scanned
 * Fix - don't prevent scan speed saving when pro plugin is enabled.
 * Add - new trigger for invalid alt text - "an image".

includes/classes/class-rest-api.php

@@ -264,15 +264,7 @@ public function clear_issues_for_post( $request ) {
 	 *
 	 * @return string
 	 */
-	public function filter_js_validation_html( string $html, string $rule_id, array $violation ): string {
-		// Add the selector to the violation message as empty paragraphs are almost always
-		// duplicate html fragments. Adding the selector makes it unique, so it can be saved.
-		if ( 'empty_paragraph_tag' === $rule_id ) {
-			$html .= $violation['selector'][0]
-				? '// {{ ' . $violation['selector'][0] . ' }}'
-				: '';
-		}
-
+	public function filter_js_validation_html( string $html, string $rule_id, array $violation ): string { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable -- the variable was used previously and will be used in future most likely.
 		// Use just the opening <html> and closing </html> tag, prevents storing entire page as the affected code.
 		if ( 'html-has-lang' === $rule_id || 'document-title' === $rule_id ) {
 			$html = preg_replace( '/^.*(<html.*?>).*(<\/html>).*$/s', '$1...$2', $html );