1 files changed, 18 insertions, 20 deletions

diff --git a/engine/lib/cron.php b/engine/lib/cron.php
index ff57a41f1..4f3d05b93 100644
--- a/engine/lib/cron.php
+++ b/engine/lib/cron.php
@@ -10,10 +10,11 @@
  * Cron initialization
  *
  * @return void
+ * @access private
  */
 function cron_init() {
 	// Register a pagehandler for cron
-	register_page_handler('cron', 'cron_page_handler');
+	elgg_register_page_handler('cron', 'cron_page_handler');
 
 	// register a hook for Walled Garden public pages
 	elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'cron_public_pages');
@@ -24,11 +25,11 @@ function cron_init() {
  *
  * @param array $page Pages
  *
- * @return void
+ * @return bool
+ * @throws CronException
+ * @access private
  */
 function cron_page_handler($page) {
-	global $CONFIG;
-
 	if (!isset($page[0])) {
 		forward();
 	}
@@ -48,12 +49,7 @@ function cron_page_handler($page) {
 	$params = array();
 	$params['time'] = time();
 
-	foreach ($CONFIG->input as $k => $v) {
-		$params[$k] = $v;
-	}
-
 	// Data to return to
-	$std_out = "";
 	$old_stdout = "";
 	ob_start();
 
@@ -61,6 +57,7 @@ function cron_page_handler($page) {
 	$std_out = ob_get_clean();
 
 	echo $std_out . $old_stdout;
+	return true;
 }
 
 /**
@@ -72,20 +69,21 @@ function cron_page_handler($page) {
  * @param mixed  $params       Params
  *
  * @return array
+ * @access private
  */
 function cron_public_pages($hook, $type, $return_value, $params) {
-	$return_value[] = 'pg/cron/minute';
-	$return_value[] = 'pg/cron/fiveminute';
-	$return_value[] = 'pg/cron/fifteenmin';
-	$return_value[] = 'pg/cron/halfhour';
-	$return_value[] = 'pg/cron/hourly';
-	$return_value[] = 'pg/cron/daily';
-	$return_value[] = 'pg/cron/weekly';
-	$return_value[] = 'pg/cron/monthly';
-	$return_value[] = 'pg/cron/yearly';
-	$return_value[] = 'pg/cron/reboot';
+	$return_value[] = 'cron/minute';
+	$return_value[] = 'cron/fiveminute';
+	$return_value[] = 'cron/fifteenmin';
+	$return_value[] = 'cron/halfhour';
+	$return_value[] = 'cron/hourly';
+	$return_value[] = 'cron/daily';
+	$return_value[] = 'cron/weekly';
+	$return_value[] = 'cron/monthly';
+	$return_value[] = 'cron/yearly';
+	$return_value[] = 'cron/reboot';
 
 	return $return_value;
 }
 
-elgg_register_event_handler('init', 'system', 'cron_init');
\ No newline at end of file
+elgg_register_event_handler('init', 'system', 'cron_init');