Merge pull request #313 from petrkotek/petrkotek-patch-1

chrisboulton · web-flow · commit a03f00f2a093 · 2016-10-20T17:00:54.000-05:00
Resque_Redis: use `&amp;&amp;` rather than `and`
diff --git a/lib/Resque/Redis.php b/lib/Resque/Redis.php
@@ -98,7 +98,7 @@ class Resque_Redis
 	 */
 	public static function prefix($namespace)
 	{
-	    if (substr($namespace, -1) !== ':' and $namespace != '') {
+	    if (substr($namespace, -1) !== ':' && $namespace != '') {
 	        $namespace .= ':';
 	    }
 	    self::$defaultNamespace = $namespace;

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class Resque_Redis`
`98`	`98`	`*/`
`99`	`99`	`public static function prefix($namespace)`
`100`	`100`	`{`
`101`		`- if (substr($namespace, -1) !== ':' and $namespace != '') {`
	`101`	`+ if (substr($namespace, -1) !== ':' && $namespace != '') {`
`102`	`102`	`$namespace .= ':';`
`103`	`103`	`}`
`104`	`104`	`self::$defaultNamespace = $namespace;`