Index: branches/5.2.x/core/kernel/managers/scheduled_task_manager.php
===================================================================
diff -u -N -r15433 -r15456
--- branches/5.2.x/core/kernel/managers/scheduled_task_manager.php	(.../scheduled_task_manager.php)	(revision 15433)
+++ branches/5.2.x/core/kernel/managers/scheduled_task_manager.php	(.../scheduled_task_manager.php)	(revision 15456)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: scheduled_task_manager.php 15433 2012-07-12 14:51:05Z alex $
+* @version	$Id: scheduled_task_manager.php 15456 2012-07-17 13:01:52Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -103,8 +103,10 @@
 			return ;
 		}
 
-		if ( !$from_cron && $this->Application->ConfigValue('RunScheduledTasksFromCron') ) {
-			// if scheduled tasks are set to run from cron
+		$use_cron = $this->Application->ConfigValue('RunScheduledTasksFromCron');
+
+		if ( ($use_cron && !$from_cron) || (!$use_cron && $from_cron) ) {
+			// match execution place with one, set in config
 			return ;
 		}