a couple last minute tweaks for 5.2.2 (#1262)

* fix inverted condition in sql string literal detection

* last minute tweaks

Author: diosmosis

CHANGELOG.md

@@ -13,6 +13,7 @@
 * Bug fix: schedule geolocation db install and other events after an install completes successfully instead of during.
 * Bug fix: do not allow multiple requests to install Matomo at the same time.
 * Bug fix: do not trigger the golocation db install task during install, if it has run at least once before.
+* Bug fix: the normal Matomo site selector should not be displayed on Matomo reporting/admin pages. It is now hidden.
 
 = 5.2.0 =
 * Update Matomo core to 5.2.1.

classes/WpMatomo/Db/WordPress.php

@@ -519,8 +519,8 @@ public function replace_placeholders( $sql ) {
 				while ( $segment_end < strlen( $sql ) ) {
 					if ( $sql[ $segment_end ] === $quote ) {
 						// '' or ""
-						$is_double_quote = $segment_end + 1 >= strlen( $sql )
-							|| $sql[ $segment_end + 1 ] === $quote;
+						$is_double_quote = $segment_end + 1 < strlen( $sql )
+							&& $sql[ $segment_end + 1 ] === $quote;
 
 						if ( $is_double_quote ) {
 							++$segment_end;

plugins/WordPress/Auth.php

@@ -140,7 +140,6 @@ private function authApiWithTokenAuthAppPassword()
                 return null;
             }
             $loggedInUserId = $authenticated->ID;
-
         } finally {
             remove_filter('application_password_is_api_request', $callback);
         }

tests/phpunit/wpmatomo/db/test-wordpress.php

@@ -326,6 +326,10 @@ public function get_test_data_for_replace_placeholders() {
 				'SELECT "?", "?.?", ? FROM mytable WHERE ? <> "?""" AND """?""" > ?',
 				'SELECT "?", "?.?", %s FROM mytable WHERE %s <> "?""" AND """?""" > %s',
 			],
+			[
+				'SELECT "?", "?.?", ? FROM mytable WHERE ? <> "?""" AND ? <> """?"""',
+				'SELECT "?", "?.?", %s FROM mytable WHERE %s <> "?""" AND %s <> """?"""',
+			],
 		];
 	}