From 7c7616ff0f3d8e1be7784a4dcbad985fb510cff3 Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Tue, 17 Nov 2009 20:47:13 +0000
Subject: [PATCH] Scan plugin cron jobs as well

---
 e107_admin/cron.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index 925e2c0b5..720625d7d 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org/).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/cron.php,v $
-|     $Revision: 1.16 $
-|     $Date: 2009-11-16 22:39:53 $
-|     $Author: e107coders $
+|     $Revision: 1.17 $
+|     $Date: 2009-11-17 20:47:13 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -91,16 +91,16 @@ class cron
 	
 		
 
-        // These core functions need to be put into e_BASE/cron.php  ie. news_purge()
+        // These core functions need to be put into e_BASE/cron.php  e.g. news_purge()
 
-        if($this->cronAction == "" || $this->cronAction == "main")
+        if($this->cronAction == '' || $this->cronAction == 'main')
 		{
 			$this -> cronRenderPage();
 		}
 		
 		
 
-		if($this->cronAction == "pref")
+		if($this->cronAction == 'pref')
 		{
         	$this -> cronRenderPrefs();
 		}
@@ -310,7 +310,6 @@ function setCronPwd()
 	{
 		global $pref;
 		
-		$core_cron = $this->coreCrons;
 		$new_cron = array();
 		
 		if(vartrue($pref['e_cron_list']))
@@ -334,9 +333,9 @@ function setCronPwd()
 				}
 			}
 		}
-		
-		$this->e_cron = array_merge($core_cron,$new_cron);
-
+		$this->e_cron = $this->coreCrons;
+		$this->e_cron['_plugins'] = $new_cron;
+		//print_a($this->e_cron);
 	}