diff options
| -rw-r--r-- | includes/controllers/family_ctrl.php | 12 | ||||
| -rw-r--r-- | includes/controllers/individual_ctrl.php | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/includes/controllers/family_ctrl.php b/includes/controllers/family_ctrl.php index 270dc5f898..894e34a60e 100644 --- a/includes/controllers/family_ctrl.php +++ b/includes/controllers/family_ctrl.php @@ -354,14 +354,14 @@ class FamilyController extends BaseController { // show/hide changes if (find_updated_record($this->getFamilyID(), WT_GED_ID)!==null) { if (!$this->show_changes) { - $submenu = new Menu(i18n::translate('This record has been updated. Click here to show changes.'), encode_url('family.php?famid='.$this->getFamilyID().'&show_changes=yes')); - $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]); - $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); - $menu->addSubmenu($submenu); + $label = i18n::translate('This record has been updated. Click here to show changes.'); + $link = $this->family->getLinkUrl().'&show_changes=yes'; } else { - $submenu = new Menu(i18n::translate('Click here to hide changes.'), encode_url('family.php?famid='.$this->getFamilyID().'&show_changes=no')); - $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]); + $label = i18n::translate('Click here to hide changes.'); + $link = $this->family->getLinkUrl().'&show_changes=no'; } + $submenu = new Menu($label, encode_url($link)); + $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php index c7aff13486..9191d34f1b 100644 --- a/includes/controllers/individual_ctrl.php +++ b/includes/controllers/individual_ctrl.php @@ -563,12 +563,13 @@ class IndividualController extends BaseController { if (find_updated_record($this->pid, WT_GED_ID)!==null) { if (!$this->show_changes) { $label = i18n::translate('This record has been updated. Click here to show changes.'); - $link = $this->indi->getLinkUrl()."&show_changes=yes"; + $link = $this->indi->getLinkUrl().'&show_changes=yes'; } else { $label = i18n::translate('Click here to hide changes.'); - $link = $this->indi->getLinkUrl()."&show_changes=no"; + $link = $this->indi->getLinkUrl().'&show_changes=no'; } $submenu = new Menu($label, encode_url($link)); + $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_indi"]["small"]); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); |