Merge pull request #18 from humancopy/master

Chris Boulton · Chris Boulton · commit cd47df24584c · 2011-12-07T04:07:42.000-08:00
A small fix for a small bug with __autoload and class_exists :)
diff --git a/lib/Resque/Redis.php b/lib/Resque/Redis.php
@@ -1,7 +1,7 @@
 <?php
 // Third- party apps may have already loaded Resident from elsewhere
 // so lets be careful.
-if(!class_exists('Redisent')) {
+if(!class_exists('Redisent', false)) {
 	require_once dirname(__FILE__) . '/../Redisent/Redisent.php';
 }
 
diff --git a/lib/Resque/RedisCluster.php b/lib/Resque/RedisCluster.php
@@ -1,7 +1,7 @@
 <?php
 // Third- party apps may have already loaded Resident from elsewhere
 // so lets be careful.
-if(!class_exists('RedisentCluster')) {
+if(!class_exists('RedisentCluster', false)) {
 	require_once dirname(__FILE__) . '/../Redisent/RedisentCluster.php';
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`	`// Third- party apps may have already loaded Resident from elsewhere`
`3`	`3`	`// so lets be careful.`
`4`		`-if(!class_exists('Redisent')) {`
	`4`	`+if(!class_exists('Redisent', false)) {`
`5`	`5`	`require_once dirname(__FILE__) . '/../Redisent/Redisent.php';`
`6`	`6`	`}`
`7`	`7`