From cd3b0cca0eb4f9be6d5f4629b65679834ae59d3d Mon Sep 17 00:00:00 2001
From: humancopy <info@humancopy.net>
Date: Wed, 18 May 2011 18:34:29 +0200
Subject: [PATCH 1/2] Set autoload to false for 'class_exists' calls. Currently
 it is not set, so the default is true which causes any defined '__autoload'
 function in the included app to be called.

---
 lib/Resque/Job.php          | 2 +-
 lib/Resque/Redis.php        | 2 +-
 lib/Resque/RedisCluster.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Resque/Job.php b/lib/Resque/Job.php
index 9d674f5..5df0fb6 100644
--- a/lib/Resque/Job.php
+++ b/lib/Resque/Job.php
@@ -142,7 +142,7 @@ class Resque_Job
 			return $this->instance;
 		}
 
-		if(!class_exists($this->payload['class'])) {
+		if(!class_exists($this->payload['class'], false)) {
 			throw new Resque_Exception(
 				'Could not find job class ' . $this->payload['class'] . '.'
 			);
diff --git a/lib/Resque/Redis.php b/lib/Resque/Redis.php
index 874bf69..78d3ac7 100644
--- 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
index 6ac15e3..dc3f728 100644
--- 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';
 }
 

From c52bcc8af77acc39a4d95ff5e91256a3fb16bc61 Mon Sep 17 00:00:00 2001
From: humancopy <info@humancopy.net>
Date: Wed, 2 Nov 2011 11:59:33 +0100
Subject: [PATCH 2/2] Re-enable autoload for class_exists in Job.php

---
 lib/Resque/Job.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Resque/Job.php b/lib/Resque/Job.php
index 4667b40..ee4aaba 100644
--- a/lib/Resque/Job.php
+++ b/lib/Resque/Job.php
@@ -142,7 +142,7 @@ class Resque_Job
 			return $this->instance;
 		}
 
-		if(!class_exists($this->payload['class'], false)) {
+		if(!class_exists($this->payload['class'])) {
 			throw new Resque_Exception(
 				'Could not find job class ' . $this->payload['class'] . '.'
 			);