From 9be4f438eb1915e0b8b005abe42e3796867cac29 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 14 Apr 2010 20:43:24 -0400
Subject: [PATCH] [feature/system-cron] Private instance variable as cron id

Changed cron lock to use a private instance variable for cron id instead of a constant.

PHPBB3-9596
---
 phpBB/includes/cron_lock.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/cron_lock.php b/phpBB/includes/cron_lock.php
index 2a09590772..22c052f5ca 100644
--- a/phpBB/includes/cron_lock.php
+++ b/phpBB/includes/cron_lock.php
@@ -22,6 +22,8 @@ if (!defined('IN_PHPBB'))
 */
 class cron_lock
 {
+	private $cron_id;
+
 	function lock() {
 		global $config, $db;
 		
@@ -44,10 +46,10 @@ class cron_lock
 			}
 		}
 
-		define('CRON_ID', time() . ' ' . unique_id());
+		$this->cron_id = time() . ' ' . unique_id();
 
 		$sql = 'UPDATE ' . CONFIG_TABLE . "
-			SET config_value = '" . $db->sql_escape(CRON_ID) . "'
+			SET config_value = '" . $db->sql_escape($this->cron_id) . "'
 			WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape($config['cron_lock']) . "'";
 		$db->sql_query($sql);
 
@@ -65,7 +67,7 @@ class cron_lock
 
 		$sql = 'UPDATE ' . CONFIG_TABLE . "
 			SET config_value = '0'
-			WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape(CRON_ID) . "'";
+			WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape($this->cron_id) . "'";
 		$db->sql_query($sql);
 	}
 }