[Cs-webdbupgrade-commits] SF.net SVN: cs-webdbupgrade:[22] trunk/0.1/cs_webdbupgrade.class.php

[<cra...@us...>]

Revision: 22
          http://cs-webdbupgrade.svn.sourceforge.net/cs-webdbupgrade/?rev=22&view=rev
Author:   crazedsanity
Date:     2009-07-30 16:19:26 +0000 (Thu, 30 Jul 2009)

Log Message:
-----------
Fix method that checks if an upgrade is in progress.

/cs_webdbupgrade.class.php:
	* upgrade_in_progress():
		-- remove default value for $retval (overwritten anyway)
		-- remove reference to "WORKINGONIT"
		-- always returns value from check_lockfile() now.
		-- NOTE::: previously this would report FALSE even if a lockfile was
		in place; this change makes the system internally consistent.

Modified Paths:
--------------
    trunk/0.1/cs_webdbupgrade.class.php

Modified: trunk/0.1/cs_webdbupgrade.class.php
===================================================================
--- trunk/0.1/cs_webdbupgrade.class.php	2009-07-30 16:09:55 UTC (rev 21)
+++ trunk/0.1/cs_webdbupgrade.class.php	2009-07-30 16:19:26 UTC (rev 22)
@@ -329,16 +329,13 @@
 	
 	//=========================================================================
 	public function upgrade_in_progress($makeItSo=FALSE) {
-		$retval = FALSE;
 		if($makeItSo === TRUE) {
 			$this->get_database_version();
 			$details = $this->projectName .': Upgrade from '. $this->databaseVersion .' started at '. date('Y-m-d H:i:s');
 			$this->create_lockfile($details);
 			$retval = TRUE;
 		}
-		elseif(preg_match('/^upgrade/i', $this->mainConfig['WORKINGONIT'])) {
-			$retval = TRUE;
-		}
+		$retval = $this->check_lockfile();
 		
 		return($retval);
 	}//end upgrade_in_progress()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.