From 247b772835778d8d1d0a8b3a1e278d89bb7ba70c Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Sun, 12 Dec 2010 17:16:24 +0100 Subject: [PATCH] Fixes education and job inclusions. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- upgrade/1.0.1/merge.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/upgrade/1.0.1/merge.php b/upgrade/1.0.1/merge.php index ce776b4..6d0f1e9 100755 --- a/upgrade/1.0.1/merge.php +++ b/upgrade/1.0.1/merge.php @@ -78,6 +78,7 @@ while ($continue > 0) { INNER JOIN profile_job AS pj ON (f.pid = pj.pid AND pj.id = $id AND pj.description = f.description) WHERE pj.jobid = f.jobid OR (pj.jobid IS NULL AND f.jobid IS NULL)"); $continue = XDB::affectedRows(); + ++$id; } XDB::rawExecute('DROP TABLE IF EXISTS fusionax_activites'); // We also have to add related phones and addresses. @@ -307,6 +308,7 @@ while ($continue > 0) { INNER JOIN profile_education AS pe ON (pe.pid = f.pid AND pe.id = $id AND pe.eduid = f.eduid AND pe.degreeid = f.degreeid AND pe.fieldid = f.fieldid AND pe.program = f.Descr_formation)"); $continue = XDB::affectedRows(); + ++$id; } // Updates merge_issues table (eduid and degreeid should never be empty). XDB::rawExecute("UPDATE profile_merge_issues AS pm -- 2.1.4