Fixed strpos: ending parentheses is in incorrect location

arianf · arianf · commit 38d89d873e6c · 2015-02-07T18:08:50.000-08:00
Fixed the current implementation of strpos, it currently looked like this

 `strpos($to_escape, "'" != false))` incorrectly passes `"'" != false` as the second argument.

Changed it to `if (strpos($to_escape, '"') !== false &amp;&amp; strpos($to_escape, "'") !== false) {`
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
@@ -259,7 +259,7 @@ public function deselectByVisibleText($text) {
    * @return string The escaped string.
    */
   protected function escapeQuotes($to_escape) {
-    if (strpos($to_escape, '"') !== false && strpos($to_escape, "'" != false)) {
+    if (strpos($to_escape, '"') !== false && strpos($to_escape, "'") !== false) {
       $substrings = explode('"', $to_escape);
 
       $escaped = "concat(";
@@ -274,7 +274,7 @@ protected function escapeQuotes($to_escape) {
       return $escaped;
     }
 
-    if (strpos($to_escape, '"' !== false)) {
+    if (strpos($to_escape, '"') !== false) {
       return sprintf("'%s'", $to_escape);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ public function deselectByVisibleText($text) {`
`259`	`259`	`* @return string The escaped string.`
`260`	`260`	`*/`
`261`	`261`	`protected function escapeQuotes($to_escape) {`
`262`		`- if (strpos($to_escape, '"') !== false && strpos($to_escape, "'" != false)) {`
	`262`	`+ if (strpos($to_escape, '"') !== false && strpos($to_escape, "'") !== false) {`
`263`	`263`	`$substrings = explode('"', $to_escape);`
`264`	`264`
`265`	`265`	`$escaped = "concat(";`
`@@ -274,7 +274,7 @@ protected function escapeQuotes($to_escape) {`
`274`	`274`	`return $escaped;`
`275`	`275`	`}`
`276`	`276`
`277`		`- if (strpos($to_escape, '"' !== false)) {`
	`277`	`+ if (strpos($to_escape, '"') !== false) {`
`278`	`278`	`return sprintf("'%s'", $to_escape);`
`279`	`279`	`}`
`280`	`280`