No duplicate code + Testing for entryPageUrl/exitPageUrl Refs #2976

git-svn-id: http://dev.piwik.org/svn/trunk@6814 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 5 insertions, 19 deletions

diff --git a/core/Updater.php b/core/Updater.php
index b993c9b46a..dfda38878a 100644
--- a/core/Updater.php
+++ b/core/Updater.php
@@ -28,8 +28,8 @@ class Piwik_Updater
 	
 	public $pathUpdateFileCore;
 	public $pathUpdateFilePlugins;
-
 	private $componentsToCheck = array();
+	private $hasMajorDbUpdate = false;
 	
 	public function __construct()
 	{
@@ -99,29 +99,13 @@ class Piwik_Updater
 
 	/**
 	 * Does one of the new versions involve a major database update?
+	 * Note: getSqlQueriesToExecute() must be called before this method!
 	 * 
 	 * @return bool
 	 */
 	public function hasMajorDbUpdate()
 	{
-		foreach($this->componentsWithUpdateFile as $componentName => $componentUpdateInfo) 
-		{
-			foreach($componentUpdateInfo as $file => $fileVersion)
-			{
-				require_once $file;
-				
-				$className = $this->getUpdateClassName($componentName, $fileVersion);
-				if(class_exists($className, false))
-				{
-					$isMajor = call_user_func( array($className, 'isMajorUpdate'));
-					if ($isMajor) {
-						return true;
-					}
-				}
-			}
-		}
-		
-		return false;
+		return $this->hasMajorDbUpdate;
 	}
 
 	/**
@@ -145,6 +129,8 @@ class Piwik_Updater
 					foreach($queriesForComponent as $query => $error) {
 						$queries[] = $query.';';
 					}
+					
+					$this->hasMajorDbUpdate = $this->hasMajorDbUpdate || call_user_func( array($className, 'isMajorUpdate'));
 				}
 			}
 			// unfortunately had to extract this query from the Piwik_Option class