From 2dc5748d85d8485e46f8b551fb207ff1a10b83a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Wed, 15 Dec 2010 00:43:05 +0100 Subject: [PATCH] Gives mail flag to ax addresses. 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 | 4 ++-- upgrade/1.0.1/merge_issues.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/upgrade/1.0.1/merge.php b/upgrade/1.0.1/merge.php index 4255429..d0b6fe5 100755 --- a/upgrade/1.0.1/merge.php +++ b/upgrade/1.0.1/merge.php @@ -248,8 +248,8 @@ XDB::rawExecute("INSERT IGNORE INTO profile_merge_issues (pid, issues) INNER JOIN profile_addresses AS pa ON (pa.pid = f.pid AND pa.type = 'home' AND pa.id = 0) WHERE f.text IS NOT NULL"); -XDB::rawExecute("INSERT INTO profile_addresses (pid, type, id, pub, text) - SELECT f.pid, 'home', IF(pa.id IS NULL , 0, MAX(pa.id) + 1), 'ax', f.text +XDB::rawExecute("INSERT INTO profile_addresses (pid, type, id, pub, text, flags) + SELECT f.pid, 'home', IF(pa.id IS NULL , 0, MAX(pa.id) + 1), 'ax', f.text, 'mail' FROM fusionax_adresses AS f LEFT JOIN profile_addresses AS pa ON (pa.pid = f.pid AND pa.type = 'home') WHERE f.text IS NOT NULL diff --git a/upgrade/1.0.1/merge_issues.php b/upgrade/1.0.1/merge_issues.php index 55f3214..1e8fdbb 100755 --- a/upgrade/1.0.1/merge_issues.php +++ b/upgrade/1.0.1/merge_issues.php @@ -135,6 +135,9 @@ foreach ($pids as $pid) { if ($minPub->isVisible($addresses[$i]->pub)) { $addresses[$i]->pub = $addresses[$j]->pub; } + if ($addresses[$j]->hasFlag('mail') && !$addresses[$i]->hasFlag('mail')) { + $addresses[$i]->addFlag('mail'); + } } } } -- 2.1.4