Skip to content

Commit

Permalink
Issue #359
Browse files Browse the repository at this point in the history 
Cannot merge two members in Administration
  • Loading branch information
@ryanhowdy
ryanhowdy committed Jun 4, 2013
1 parent 2e9b475 commit d8ef6fb
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 77 deletions.
17 changes: 5 additions & 12 deletions README
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

Family Connections 3.2.2
Family Connections 3.3


Installation
------------

1. Upload the familyconnections/ directory in FCMS_3.2.2.zip to your web host.
1. Upload the familyconnections/ directory in FCMS_3.3.zip to your web host.

2. Run the online installation script by visiting your website.

Expand All @@ -15,7 +15,7 @@



Upgrading from 2.6+ to 3.2.2
Upgrading from 2.6+ to 3.3
---------------------------

** DO NOT DELETE THE FOLLOWING FILE **
Expand All @@ -40,16 +40,9 @@
Change Log
----------

3.2.2
3.3

#350 - Viewing sent PM fails with PHP error
#351 - Family New scheduler not working
#353 - Italian is displayed as "it_IT" in language list on the login page Translations
#346 - Gallery images missing if uploads directory is secured Photo Gallery
#347 - Display Birthday Event not calculating age Calendar
#348 - Images not displayed after upload. Photo Gallery
#349 - Notifications not displayed Notifications
#345 - Undefined index: maiden - Family Tree add new member Family Tree
#359 - Cannot merge two members in Administration


For the full change log please refer to the included ChangeLog file.
Expand Down
133 changes: 68 additions & 65 deletions familyconnections/inc/admin_members_class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,14 +630,17 @@ function displayMergeMemberFormReview ($id, $merge)
u.`dob_year`, u.`dob_month`, u.`dob_day`,
a.`address`, a.`city`, a.`state`, a.`zip`, a.`home`, a.`work`, a.`cell`, u.`bio`
FROM `fcms_users` AS u, `fcms_address` AS a
WHERE u.`id` IN ('$id', '$merge')
WHERE u.`id` IN (?, ?)
AND u.`id` = a.`user`";
if (!$this->db->query($sql))

$rows = $this->fcmsDatabase->getRows($sql, array($id, $merge));
if ($rows === false)
{
$this->fcmsError->displayError();
return;
}
while ($r = $this->db->get_row())

foreach ($rows as $r)
{
$members[$r['id']] = $r;
}
Expand Down Expand Up @@ -1363,8 +1366,8 @@ function mergeMember ($id, $merge)

// fcms_alerts
$sql = "DELETE FROM `fcms_alerts`
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
WHERE `user` = ?";
if (!$this->fcmsDatabase->delete($sql, $merge))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1373,9 +1376,9 @@ function mergeMember ($id, $merge)

// fcms_board_posts
$sql = "UPDATE `fcms_board_posts`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1384,17 +1387,17 @@ function mergeMember ($id, $merge)

// fcms_board_thread
$sql = "UPDATE `fcms_board_threads`
SET `started_by` = '$id'
WHERE `started_by` = '$merge'";
if (!$this->db->query($sql))
SET `started_by` = ?
WHERE `started_by` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
}
$sql = "UPDATE `fcms_board_threads`
SET `updated_by` = '$id'
WHERE `updated_by` = '$merge'";
if (!$this->db->query($sql))
SET `updated_by` = ?
WHERE `updated_by` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1403,9 +1406,9 @@ function mergeMember ($id, $merge)

// fcms_calendar
$sql = "UPDATE `fcms_calendar`
SET `created_by` = '$id'
WHERE `created_by` = '$merge'";
if (!$this->db->query($sql))
SET `created_by` = ?
WHERE `created_by` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1414,9 +1417,9 @@ function mergeMember ($id, $merge)

// fcms_category
$sql = "UPDATE `fcms_category`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1431,9 +1434,9 @@ function mergeMember ($id, $merge)

// fcms_documents
$sql = "UPDATE `fcms_documents`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1442,9 +1445,9 @@ function mergeMember ($id, $merge)

// fcms_gallery_photo_comments
$sql = "UPDATE `fcms_gallery_photo_comment`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1453,9 +1456,9 @@ function mergeMember ($id, $merge)

// fcms_gallery_photos
$sql = "UPDATE `fcms_gallery_photos`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1464,9 +1467,9 @@ function mergeMember ($id, $merge)

// fcms_gallery_photos_tags
$sql = "UPDATE `fcms_gallery_photos_tags`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1477,9 +1480,9 @@ function mergeMember ($id, $merge)

// fcms_news
$sql = "UPDATE `fcms_news`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1488,9 +1491,9 @@ function mergeMember ($id, $merge)

// fcms_news_comments
$sql = "UPDATE `fcms_news_comments`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1503,9 +1506,9 @@ function mergeMember ($id, $merge)

// fcms_poll_votes
$sql = "UPDATE `fcms_poll_votes`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1514,9 +1517,9 @@ function mergeMember ($id, $merge)

// fcms_prayers
$sql = "UPDATE `fcms_prayers`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1525,17 +1528,17 @@ function mergeMember ($id, $merge)

// fcms_privatemsg
$sql = "UPDATE `fcms_privatemsg`
SET `to` = '$id'
WHERE `to` = '$merge'";
if (!$this->db->query($sql))
SET `to` = ?
WHERE `to` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
}
$sql = "UPDATE `fcms_privatemsg`
SET `from` = '$id'
WHERE `from` = '$merge'";
if (!$this->db->query($sql))
SET `from` = ?
WHERE `from` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1544,9 +1547,9 @@ function mergeMember ($id, $merge)

// fcms_recipes
$sql = "UPDATE `fcms_recipes`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1555,9 +1558,9 @@ function mergeMember ($id, $merge)

// fcms_recipe_comment
$sql = "UPDATE `fcms_recipe_comment`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1566,17 +1569,17 @@ function mergeMember ($id, $merge)

// fcms_relationship
$sql = "UPDATE `fcms_relationship`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
}
$sql = "UPDATE `fcms_relationship`
SET `rel_user` = '$id'
WHERE `rel_user` = '$merge'";
if (!$this->db->query($sql))
SET `rel_user` = ?
WHERE `rel_user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand All @@ -1587,9 +1590,9 @@ function mergeMember ($id, $merge)

// fcms_user_awards
$sql = "UPDATE `fcms_user_awards`
SET `user` = '$id'
WHERE `user` = '$merge'";
if (!$this->db->query($sql))
SET `user` = ?
WHERE `user` = ?";
if (!$this->fcmsDatabase->update($sql, array($id, $merge)))
{
$this->fcmsError->displayError();
die();
Expand Down

0 comments on commit d8ef6fb

Please sign in to comment.