Remove old references to print-preview mode

9 files changed, 46 insertions, 55 deletions

diff --git a/modules/GEDFact_assistant/_CENS/census_3_search_add.php b/modules/GEDFact_assistant/_CENS/census_3_search_add.php
index b3326f849c..f1b13d0333 100644
--- a/modules/GEDFact_assistant/_CENS/census_3_search_add.php
+++ b/modules/GEDFact_assistant/_CENS/census_3_search_add.php
@@ -168,7 +168,7 @@ if (!defined('WT_WEBTREES')) {
 								$marn  = $nam[1]['surname'];
 							}
 							$menu = new Menu($people["husb"]->getLabel()."\n");
-							$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $people["husb"]->getLabel(), $censdate);
+							$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, true, 0, $personcount++, $people["husb"]->getLabel(), $censdate);
 							$slabel .= $parentlinks;
 							$submenu = new Menu($slabel);
 							$menu->addSubMenu($submenu);
@@ -304,7 +304,7 @@ if (!defined('WT_WEBTREES')) {
 								$fulmn = $fulln;
 							}
 							$menu = new Menu($people["wife"]->getLabel()."\n");
-							$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $people["wife"]->getLabel(), $censyear);
+							$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, true, 0, $personcount++, $people["wife"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
 							$submenu = new Menu($slabel);
 							$menu->addSubMenu($submenu);
@@ -444,7 +444,7 @@ if (!defined('WT_WEBTREES')) {
 								}
 								
 								$menu = new Menu($child->getLabel()."\n");
-								$slabel  = print_pedigree_person_nav2($child->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $child->getLabel(), $censyear);
+								$slabel  = print_pedigree_person_nav2($child->getXref(), 2, true, 0, $personcount++, $child->getLabel(), $censyear);
 								$slabel .= $spouselinks;
 								$submenu = new Menu($slabel);
 								$menu->addSubMenu($submenu);
@@ -620,7 +620,7 @@ if (!defined('WT_WEBTREES')) {
 							}else{
 								$menu->addLabel($people["husb"]->getLabel()."\n");
 							}
-							$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $people["husb"]->getLabel(), $censyear);
+							$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, true, 0, $personcount++, $people["husb"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
 							$submenu = new Menu($slabel);
 							$menu->addSubMenu($submenu);
@@ -767,7 +767,7 @@ if (!defined('WT_WEBTREES')) {
 							}else{
 								$menu->addLabel($people["wife"]->getLabel()."\n");
 							}
-							$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $people["wife"]->getLabel(), $censyear);
+							$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, true, 0, $personcount++, $people["wife"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
 							$submenu = new Menu($slabel);
 							$menu->addSubMenu($submenu);
@@ -903,7 +903,7 @@ if (!defined('WT_WEBTREES')) {
 									$marn  = $nam[1]['surname'];
 								}
 								$menu = new Menu($child->getLabel()."\n");
-								$slabel  = print_pedigree_person_nav2($child->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $child->getLabel(), $censyear);
+								$slabel  = print_pedigree_person_nav2($child->getXref(), 2, true, 0, $personcount++, $child->getLabel(), $censyear);
 								$slabel .= $spouselinks;
 								$submenu = new Menu($slabel);
 								$menu->addSubMenu($submenu);
@@ -1058,7 +1058,7 @@ if (!defined('WT_WEBTREES')) {
 								$marn  = $nam[1]['surname'];
 							}
 							$menu = new Menu($people["husb"]->getLabel()."\n");
-							$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $people["husb"]->getLabel(), $censyear);
+							$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, true, 0, $personcount++, $people["husb"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
 							$submenu = new Menu($slabel);
 							$menu->addSubMenu($submenu);
@@ -1205,7 +1205,7 @@ if (!defined('WT_WEBTREES')) {
 								//$fulmn   = str_replace('"', '\"', $fulmn);
 							}
 							$menu = new Menu($people["wife"]->getLabel()."\n");
-							$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $people["wife"]->getLabel(), $censyear);
+							$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, true, 0, $personcount++, $people["wife"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
 							$submenu = new Menu($slabel);
 							$menu->addSubMenu($submenu);
@@ -1353,7 +1353,7 @@ if (!defined('WT_WEBTREES')) {
 								$marn  = $surn;
 							}
 							$menu = new Menu($child->getLabel()."\n");
-							$slabel = print_pedigree_person_nav2($child->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $child->getLabel(), $censyear);
+							$slabel = print_pedigree_person_nav2($child->getXref(), 2, true, 0, $personcount++, $child->getLabel(), $censyear);
 							$slabel .= $spouselinks;
 							$submenu = new Menu($slabel);
 							$menu->addSubmenu($submenu);
diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
index 8ce94489a6..653a986322 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
@@ -133,7 +133,7 @@ if (!defined('WT_WEBTREES')) {
 				}
 				$menu = new Menu(" " . $people["husb"]->getLabel() . " ". "\n");
 				// $menu->addClass("", "", "submenu");
-				$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $currpid, $censyear);
+				$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, true, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
 				$submenu = new Menu($slabel);
 				$menu->addSubMenu($submenu);
@@ -220,7 +220,7 @@ if (!defined('WT_WEBTREES')) {
 				
 				$menu = new Menu(" " . $people["wife"]->getLabel() . " ". "\n");
 				//$menu->addClass("", "", "submenu");
-				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $currpid, $censyear);
+				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, true, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
 				$submenu = new Menu($slabel);
 				$menu->addSubMenu($submenu);
@@ -317,7 +317,7 @@ if (!defined('WT_WEBTREES')) {
 					
 					$menu = new Menu(" " . $child->getLabel() . " ". "\n");
 					//$menu->addClass("", "", "submenu");
-					$slabel  = print_pedigree_person_nav2($child->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $currpid, $censyear);
+					$slabel  = print_pedigree_person_nav2($child->getXref(), 2, true, 0, $personcount++, $currpid, $censyear);
 					$slabel .= $spouselinks;
 					$submenu = new Menu($slabel);
 					$menu->addSubMenu($submenu);
@@ -441,7 +441,7 @@ if (!defined('WT_WEBTREES')) {
 					$menu->addLabel(" " . $people["husb"]->getLabel() . " ". "\n");
 				}
 				//$menu->addClass("", "", "submenu");
-				$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $currpid, $censyear);
+				$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, true, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
 				$submenu = new Menu($slabel);
 				$menu->addSubMenu($submenu);
@@ -535,7 +535,7 @@ if (!defined('WT_WEBTREES')) {
 					$menu->addLabel(" " . $people["wife"]->getLabel() . " ". "\n");
 				}
 				//$menu->addClass("", "", "submenu");
-				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $currpid, $censyear);
+				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, true, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
 				$submenu = new Menu($slabel);
 				$menu->addSubMenu($submenu);
@@ -633,7 +633,7 @@ if (!defined('WT_WEBTREES')) {
 					}
 					$menu = new Menu(" " . $child->getLabel() . "\n");
 					//$menu->addClass("", "", "submenu");
-					$slabel  = print_pedigree_person_nav2($child->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $currpid, $censyear);
+					$slabel  = print_pedigree_person_nav2($child->getXref(), 2, true, 0, $personcount++, $currpid, $censyear);
 					$slabel .= $spouselinks;
 					$submenu = new Menu($slabel);
 					$menu->addSubMenu($submenu);								if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($child->getDeathYear()); }
@@ -728,7 +728,7 @@ if (!defined('WT_WEBTREES')) {
 				}
 				$menu = new Menu(" " . $people["husb"]->getLabel() . " ". "\n");
 				//$menu->addClass("", "", "submenu");
-				$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $currpid, $censyear);
+				$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, true, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
 				$submenu = new Menu($slabel);
 				$menu->addSubMenu($submenu);
@@ -826,7 +826,7 @@ if (!defined('WT_WEBTREES')) {
 				}
 				$menu = new Menu(" " . $people["wife"]->getLabel() . " ". "\n");
 				//$menu->addClass("", "", "submenu");
-				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $currpid, $censyear);
+				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, true, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
 				$submenu = new Menu($slabel);
 				$menu->addSubMenu($submenu);
@@ -934,7 +934,7 @@ if (!defined('WT_WEBTREES')) {
 					}
 					$menu = new Menu(" " . $child->getLabel() . " ". "\n");
 					//$menu->addClass("", "", "submenu");
-					$slabel = print_pedigree_person_nav2($child->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++, $child->getLabel(), $censyear);
+					$slabel = print_pedigree_person_nav2($child->getXref(), 2, true, 0, $personcount++, $child->getLabel(), $censyear);
 					$slabel .= $spouselinks;
 					$submenu = new Menu($slabel);
 					$menu->addSubmenu($submenu);
diff --git a/modules/family_nav/module.php b/modules/family_nav/module.php
index 8f3e40fea2..46ce1a7918 100644
--- a/modules/family_nav/module.php
+++ b/modules/family_nav/module.php
@@ -156,7 +156,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}else{

 					$menu->addClass("", "", "submenu flyout2rtl");

 				}

-				$slabel  = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);

+				$slabel  = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, true, 0, $personcount++);

 				$slabel .= $parentlinks."<a>";

 				$submenu = new Menu($slabel);

 				$menu->addSubMenu($submenu);

@@ -191,7 +191,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}else{

 					$menu->addClass("", "", "submenu flyout2rtl");

 				}

-				$slabel  = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);

+				$slabel  = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, true, 0, $personcount++);

 				$slabel .= $parentlinks."<a>";

 				$submenu = new Menu($slabel);

 				$menu->addSubMenu($submenu);

@@ -230,7 +230,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 					}else{

 						$menu->addClass("", "", "submenu flyout2rtl");

 					}

-					$slabel  = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);

+					$slabel  = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, true, 0, $personcount++);

 					$slabel .= $spouselinks."<a>";

 					$submenu = new Menu($slabel);

 					$menu->addSubMenu($submenu);

@@ -306,7 +306,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}else{

 					$menu->addClass("", "", "submenu flyout2rtl");

 				}

-				$slabel  = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);

+				$slabel  = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, true, 0, $personcount++);

 				$slabel .= $parentlinks."<a>";

 				$submenu = new Menu($slabel);

 				$menu->addSubMenu($submenu);

@@ -350,7 +350,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}else{

 					$menu->addClass("", "", "submenu flyout2rtl");

 				}

-				$slabel  = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);

+				$slabel  = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, true, 0, $personcount++);

 				$slabel .= $parentlinks."<a>";

 				$submenu = new Menu($slabel);

 				$menu->addSubMenu($submenu);

@@ -388,7 +388,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 					}else{

 						$menu->addClass("", "", "submenu flyout2rtl");

 					}

-					$slabel  = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);

+					$slabel  = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, true, 0, $personcount++);

 					$slabel .= $spouselinks."<a>";

 					$submenu = new Menu($slabel);

 					$menu->addSubMenu($submenu);

@@ -450,7 +450,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}else{

 					$menu->addClass("", "", "submenu flyout2rtl");

 				}

-				$slabel  = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);

+				$slabel  = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, true, 0, $personcount++);

 				$slabel .= $parentlinks."<a>";

 				$submenu = new Menu($slabel);

 				$menu->addSubMenu($submenu);

@@ -490,7 +490,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}else{

 					$menu->addClass("", "", "submenu flyout2rtl");

 				}

-				$slabel  = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);

+				$slabel  = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, true, 0, $personcount++);

 				$slabel .= $parentlinks."<a>";

 				$submenu = new Menu($slabel);

 				$menu->addSubMenu($submenu);

@@ -532,7 +532,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 					}else{

 						$menu->addClass("", "", "submenu flyout2rtl");

 					}

-					$slabel = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);

+					$slabel = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, true, 0, $personcount++);

 					$slabel .= $spouselinks."<a>";

 					$submenu = new Menu($slabel);

 					$menu->addSubmenu($submenu);

diff --git a/modules/googlemap/pedigree_map.php b/modules/googlemap/pedigree_map.php
index 9cb914316b..2a5d665d1e 100644
--- a/modules/googlemap/pedigree_map.php
+++ b/modules/googlemap/pedigree_map.php
@@ -94,7 +94,6 @@ echo "<h2>" . i18n::translate('Pedigree Map') . " " . i18n::translate('for') . "
 echo PrintReady($controller->getPersonName())."</h2>";
 
 // -- print the form to change the number of displayed generations
-if (!$controller->isPrintPreview()) {
 ?>
 <script language="JavaScript" type="text/javascript">
 	<!--
@@ -187,7 +186,6 @@ if (!$controller->isPrintPreview()) {
 	</td></tr>
 </table>
 	
-<?php } ?>
 <!-- end of form -->
 
 <!-- count records by type -->
@@ -795,8 +793,4 @@ document.getElementById("side_bar").innerHTML = side_bar_html;
 //]]>
 </script>
 <?php
-if ($controller->isPrintPreview()) {
-	echo "<br /><br /><br />\n";
-}
 print_footer();
-?>
diff --git a/modules/media/module.php b/modules/media/module.php
index efb97fbdc8..493332becd 100644
--- a/modules/media/module.php
+++ b/modules/media/module.php
@@ -83,7 +83,7 @@ class media_WT_Module extends WT_Module implements WT_Module_Tab {
 			$media_found = print_main_media($this->controller->pid, 0, true);
 			if (!$media_found) print "<tr><td id=\"no_tab4\" colspan=\"2\" class=\"facts_value\">".i18n::translate('There are no media objects for this individual.')."</td></tr>\n";
 			//-- New Media link
-			if (!$this->controller->isPrintPreview() && WT_USER_CAN_EDIT && $this->controller->indi->canDisplayDetails()) {
+			if (WT_USER_CAN_EDIT && $this->controller->indi->canDisplayDetails()) {
 		?>
 				<tr>
 					<td class="facts_label"><?php echo i18n::translate('Add media'), help_link('add_media'); ?></td>
diff --git a/modules/notes/module.php b/modules/notes/module.php
index 133b19c679..899ebc68cb 100644
--- a/modules/notes/module.php
+++ b/modules/notes/module.php
@@ -94,7 +94,7 @@ if (!$this->controller->indi->canDisplayDetails()) {
 	}
 	if ($this->get_note_count()==0) print "<tr><td id=\"no_tab2\" colspan=\"2\" class=\"facts_value\">".i18n::translate('There are no Notes for this individual.')."</td></tr>\n";
 	//-- New Note Link
-	if (!$this->controller->isPrintPreview() && $this->controller->canedit) {
+	if ($this->controller->canedit) {
 		?>
 	<tr>
 		<td class="facts_label"><?php echo i18n::translate('Add Note'), help_link('add_note'); ?></td>
diff --git a/modules/personal_facts/module.php b/modules/personal_facts/module.php
index 376b5c1e94..fb157ce4ef 100644
--- a/modules/personal_facts/module.php
+++ b/modules/personal_facts/module.php
@@ -114,7 +114,7 @@ class personal_facts_WT_Module extends WT_Module implements WT_Module_Tab {
 			}
 		}
 		//-- new fact link
-		if ((!$this->controller->isPrintPreview()) && $this->controller->canedit) {
+		if ($this->controller->canedit) {
 			print_add_new_fact($this->controller->pid, $indifacts, "INDI");
 		}
 		?>
diff --git a/modules/relatives/module.php b/modules/relatives/module.php
index 755108079e..44e8f05fb2 100644
--- a/modules/relatives/module.php
+++ b/modules/relatives/module.php
@@ -57,7 +57,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 			<tr>
 				<td><img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["cfamily"]["small"]; ?>" border="0" class="icon" alt="" /></td>
 				<td><span class="subheaders"><?php print PrintReady($label); ?></span>
-				<?php if ((!$this->controller->isPrintPreview())&&(empty($SEARCH_SPIDER))) { ?>
+				<?php if (empty($SEARCH_SPIDER)) { ?>
 					- <a href="family.php?famid=<?php print $famid; ?>"><?php print i18n::translate('View Family'); ?></a>
 				<?php }?>
 				</td>
@@ -85,7 +85,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 			<tr>
 				<td class="facts_labelblue"><?php print $people["newhusb"]->getLabel(); ?></td>
 				<td class="<?php print $this->controller->getPersonStyle($people["newhusb"]); ?>">
-					<?php print_pedigree_person($people["newhusb"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++); ?>
+					<?php print_pedigree_person($people["newhusb"]->getXref(), 2, true, 0, $personcount++); ?>
 				</td>
 			</tr>
 			<?php
@@ -97,7 +97,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 			<tr>
 				<td class="facts_label<?php print $styleadd; ?>"><?php print $people["husb"]->getLabel(); ?></td>
 				<td class="<?php print $this->controller->getPersonStyle($people["husb"]); ?>">
-					<?php print_pedigree_person($people["husb"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++); ?>
+					<?php print_pedigree_person($people["husb"]->getXref(), 2, true, 0, $personcount++); ?>
 				</td>
 			</tr>
 			<?php
@@ -105,7 +105,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 		}
 		//-- missing father
 		if ($type=="parents" && !isset($people["husb"]) && !isset($people["newhusb"])) {
-			if (!$this->controller->isPrintPreview() && $this->controller->canedit) {
+			if ($this->controller->canedit) {
 				?>
 				<tr>
 					<td class="facts_label"><?php print i18n::translate('Add a new father'); ?></td>
@@ -116,7 +116,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 		}
 		//-- missing husband
 		if ($type=="spouse" && $this->controller->indi->equals($people["wife"]) && !isset($people["husb"]) && !isset($people["newhusb"])) {
-			if (!$this->controller->isPrintPreview() && $this->controller->canedit) {
+			if ($this->controller->canedit) {
 				?>
 				<tr>
 					<td class="facts_label"><?php print i18n::translate('Add husband'); ?></td>
@@ -133,7 +133,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 			<tr>
 				<td class="facts_labelblue"><?php print $people["newwife"]->getLabel($elderdate); ?></td>
 				<td class="<?php print $this->controller->getPersonStyle($people["newwife"]); ?>">
-					<?php print_pedigree_person($people["newwife"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++); ?>
+					<?php print_pedigree_person($people["newwife"]->getXref(), 2, true, 0, $personcount++); ?>
 				</td>
 			</tr>
 			<?php
@@ -144,14 +144,14 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 			<tr>
 				<td class="facts_label<?php print $styleadd; ?>"><?php print $people["wife"]->getLabel($elderdate); ?></td>
 				<td class="<?php print $this->controller->getPersonStyle($people["wife"]); ?>">
-					<?php print_pedigree_person($people["wife"]->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++); ?>
+					<?php print_pedigree_person($people["wife"]->getXref(), 2, true, 0, $personcount++); ?>
 				</td>
 			</tr>
 			<?php
 		}
 		//-- missing mother
 		if ($type=="parents" && !isset($people["wife"]) && !isset($people["newwife"])) {
-			if (!$this->controller->isPrintPreview() && $this->controller->canedit) {
+			if ($this->controller->canedit) {
 				?>
 				<tr>
 					<td class="facts_label"><?php print i18n::translate('Add a new mother'); ?></td>
@@ -162,7 +162,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 		}
 		//-- missing wife
 		if ($type=="spouse" && $this->controller->indi->equals($people["husb"]) && !isset($people["wife"]) && !isset($people["newwife"])) {
-			if (!$this->controller->isPrintPreview() && $this->controller->canedit) {
+			if ($this->controller->canedit) {
 				?>
 				<tr>
 					<td class="facts_label"><?php print i18n::translate('Add wife'); ?></td>
@@ -259,7 +259,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 				<td class="facts_label<?php print $styleadd; ?>"><?php if ($styleadd=="red") print $child->getLabel(); else print $child->getLabel($elderdate, $key+1); ?></td>
 				<td class="<?php print $this->controller->getPersonStyle($child); ?>">
 				<?php
-				print_pedigree_person($child->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);
+				print_pedigree_person($child->getXref(), 2, true, 0, $personcount++);
 				?>
 				</td>
 			</tr>
@@ -275,7 +275,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 				<td class="facts_label<?php print $styleadd; ?>"><?php if ($styleadd=="red") print $child->getLabel(); else print $child->getLabel($elderdate, $key+1); ?></td>
 				<td class="<?php print $this->controller->getPersonStyle($child); ?>">
 				<?php
-				print_pedigree_person($child->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);
+				print_pedigree_person($child->getXref(), 2, true, 0, $personcount++);
 				?>
 				</td>
 			</tr>
@@ -291,7 +291,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 				<td class="facts_label<?php print $styleadd; ?>"><?php if ($styleadd=="red") print $child->getLabel(); else print $child->getLabel($elderdate, $key+1); ?></td>
 				<td class="<?php print $this->controller->getPersonStyle($child); ?>">
 				<?php
-				print_pedigree_person($child->getXref(), 2, !$this->controller->isPrintPreview(), 0, $personcount++);
+				print_pedigree_person($child->getXref(), 2, true, 0, $personcount++);
 				?>
 				</td>
 			</tr>
@@ -299,7 +299,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 			$elderdate = $child->getBirthDate();
 			++$key;
 		}
-		if (isset($family) && !$this->controller->isPrintPreview() && $this->controller->canedit) {
+		if (isset($family) && $this->controller->canedit) {
 			if ($type == "spouse") {
 				$child_u = i18n::translate('Add a son or daughter');
 				$child_m = i18n::translate('Son');
@@ -349,18 +349,16 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 		$ABBREVIATE_CHART_LABELS = false; // Override GEDCOM configuration
 		
 		ob_start();
-		if (!$this->controller->isPrintPreview()) {
 		?>
 		<table class="facts_table"><tr><td style="width:20%; padding:4px"></td><td class="descriptionbox rela">
 		<input id="checkbox_elder" type="checkbox" onclick="toggleByClassName('DIV', 'elderdate');" <?php if ($SHOW_AGE_DIFF) echo "checked=\"checked\"";?>/>
 		<label for="checkbox_elder"><?php echo i18n::translate('Show date differences'), help_link('age_differences'); ?></label>
 		</td></tr></table>
 		<?php
-		}
 		$personcount=0;
 		$families = $this->controller->indi->getChildFamilies();
 		if (count($families)==0) {
-			if (/**!$this->controller->isPrintPreview() &&**/ $this->controller->canedit) {
+			if ($this->controller->canedit) {
 				?>
 				<table class="facts_table">
 					<tr>
@@ -424,7 +422,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 		</script>
 		<br />
 		<?php
-		if (!$this->controller->isPrintPreview() && $this->controller->canedit) {
+		if ($this->controller->canedit) {
 		?>
 		<table class="facts_table">
 		<?php if (count($families)>1) { ?>
diff --git a/modules/sources_tab/module.php b/modules/sources_tab/module.php
index 50470fbcf5..650feec159 100644
--- a/modules/sources_tab/module.php
+++ b/modules/sources_tab/module.php
@@ -91,7 +91,7 @@ class sources_tab_WT_Module extends WT_Module implements WT_Module_Tab {
 			}
 			if ($this->get_source_count()==0) print "<tr><td id=\"no_tab3\" colspan=\"2\" class=\"facts_value\">".i18n::translate('There are no Source citations for this individual.')."</td></tr>\n";
 			//-- New Source Link
-			if (!$this->controller->isPrintPreview() && $this->controller->canedit) {
+			if ($this->controller->canedit) {
 			?>
 				<tr>
 					<td class="facts_label"><?php echo i18n::translate('Add Source Citation'), help_link('add_source'); ?></td>
@@ -146,5 +146,4 @@ class sources_tab_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function getJSCallback() {
 		return '';
 	}
-	
 }