Charts as modules - more work

1 files changed, 7 insertions, 4 deletions

diff --git a/app/Module/DescendancyChartModule.php b/app/Module/DescendancyChartModule.php
index cb218cbad2..7412d1047f 100644
--- a/app/Module/DescendancyChartModule.php
+++ b/app/Module/DescendancyChartModule.php
@@ -56,19 +56,22 @@ class DescendancyChartModule extends AbstractModule implements ModuleChartInterf
 	/**
 	 * Return a menu item for this chart.
 	 *
-	 * @return Menu
+	 * @return Menu|null
 	 */
 	public function getChartMenu(Individual $individual) {
-		global $controller, $WT_TREE;
-		
 		return new Menu(
 			$this->getTitle(), 
-			'descendancy.php?rootid=' . $individual->getXref() . '&ged=' . $WT_TREE->getNameUrl(), 
+			'descendancy.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(), 
 			'menu-chart-descendants', 
 			array('rel' => 'nofollow')
 		);
 	}
 	
+	/**
+	 * Return a menu item for this chart - for use in individual boxes.
+	 *
+	 * @return Menu|null
+	 */
 	public function getBoxChartMenu(Individual $individual) {
 		return $this->getChartMenu($individual);
 	}