merge + private now uses link and md5

CHANGELOG

@@ -40,7 +40,6 @@ CommitDate: 2012-02-17 13:42:33 +0100
 - Some expressions has not been translated yet.
 =====
 0.3.3
-FIXME
 
 =====
 0.3.4
@@ -53,3 +52,61 @@ FIXME
 
 + channel choice !
 
+=====
+0.4.1
++ parent tab is AdminModules
++ Better implementation of channel
+
+=====
+0.4.2
+norms
+
+=====
+0.4.3
+norms
+AddConfToFile
+Smarty2 warning if used
+new restoration system
+
+=====
+0.4.4
+listFilesInDir bugfix
+now it's possible to delete backup from BO
+
+=====
+0.4.5
+admin/autoupgrade cleared if module uninstallation
+fix cacheFS
+colors in console
+
+=====
+0.4.6
+image are now saved (bugfix option)
+
+=====
+0.4.7
+norms
++ private exclude/include major upgrade option
+- fix check root status
+
+=====
+0.4.11
+new check : cache has to be deactivated
+you can now select any zipfile in downloadDir when channel is archive
+
+=====
+0.4.12
+translations fix
+
+=====
+0.4.13
+autoupgrade dir is skipped from "checkModifiedFiles"
+configure button on module page
+now test_dir skip the img/p directory
++ new feature upgradeModules
++ new feature mergeTranslations
+
+=====
+0.5
+fix warning_exists
+release 0.5 !

modules/autoupgrade/AdminSelfUpgrade.php

@@ -685,7 +685,7 @@ public function init()
 			$this->restoreIgnoreAbsoluteFiles[] = '/img';
 		}
 
-		// do not copy install dir
+		// NEVER copy install dir
 		$this->excludeAbsoluteFilesFromUpgrade[] = '/install';
 		if ($this->keepDefaultTheme)
 		{
@@ -1250,7 +1250,6 @@ public function ajaxProcessCheckFilesVersion()
 	public function ajaxProcessUpgradeNow()
 	{
 		$this->next_desc = $this->l('Starting upgrade ...');
-		// $this->cleanTmpFiles();
 
 		$channel = $this->getConfig('channel');
 		$this->next = 'download';
@@ -2992,7 +2991,7 @@ public function ajaxProcessBackupDb()
 					$backup_loop_limit = $this->nextParams['backup_loop_limit'];
 					$data = Db::getInstance()->executeS('SELECT * FROM `'.$table.'` LIMIT '.(int)$backup_loop_limit.',200', false, false);
 					$this->nextParams['backup_loop_limit'] += 200;
-					$sizeof = DB::getInstance()->numRows(false);
+					$sizeof = DB::getInstance()->numRows();
 					if ($data && ($sizeof > 0))
 					{
 						// Export the table data
@@ -5037,4 +5036,3 @@ public function displayInvalidToken()
 		die('{wrong token}');
 	}
 }
-

modules/autoupgrade/autoupgrade.php

@@ -166,3 +166,4 @@ public function getContent()
 		Tools14::redirectAdmin('index.php?tab=AdminSelfUpgrade&token='.Tools14::getAdminTokenLite('AdminSelfUpgrade'));
 	}
 }
+