#2031 - Add class_exists() before method_exists() if class existence is unknown.

- fixed all instances of this in core code
- deleted previous Zend Guard Loader workaround in MY_Kohana.php
- updated Bootstrap.php to reflect deleted MY_Kohana.php

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 12461325..571995b3 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -32,7 +32,7 @@ class Rss_Controller extends Controller {
     // Run the appropriate feed callback
     if (module::is_active($module_id)) {
       $class_name = "{$module_id}_rss";
-      if (method_exists($class_name, "feed")) {
+      if (class_exists($class_name) && method_exists($class_name, "feed")) {
         $feed = call_user_func(
           array($class_name, "feed"), $feed_id,
           ($page - 1) * $page_size, $page_size, $id);
diff --git a/modules/rss/helpers/rss_block.php b/modules/rss/helpers/rss_block.php
index 74334e93..9a77b05d 100644
--- a/modules/rss/helpers/rss_block.php
+++ b/modules/rss/helpers/rss_block.php
@@ -29,7 +29,7 @@ class rss_block_Core {
       $feeds = array();
       foreach (module::active() as $module) {
         $class_name = "{$module->name}_rss";
-        if (method_exists($class_name, "available_feeds")) {
+        if (class_exists($class_name) && method_exists($class_name, "available_feeds")) {
           $feeds = array_merge($feeds,
             call_user_func(array($class_name, "available_feeds"), $theme->item(), $theme->tag()));
         }