diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-12-31 09:25:33 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-12-31 09:25:33 +0000 |
| commit | a6b0e82f56962c12492005763816db659d4016c2 (patch) | |
| tree | 6c33664419205f4d3a884819655303f7274c7801 /modules | |
| parent | 0c51daab93511025f234efe77f3836173a8baa1d (diff) | |
| download | webtrees-a6b0e82f56962c12492005763816db659d4016c2.tar.gz webtrees-a6b0e82f56962c12492005763816db659d4016c2.tar.bz2 webtrees-a6b0e82f56962c12492005763816db659d4016c2.zip | |
#695905 - Album tab failing to show attached media - 10184
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/lightbox/album.php | 1 | ||||
| -rw-r--r-- | modules/lightbox/module.php | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/modules/lightbox/album.php b/modules/lightbox/album.php index 18ee57316e..de9cb25d6c 100644 --- a/modules/lightbox/album.php +++ b/modules/lightbox/album.php @@ -39,6 +39,7 @@ global $edit, $controller, $tabno, $_REQUEST, $thumb_edit, $n, $LB_URL_WIDTH, $L global $reorder, $rownum, $sort_i, $GEDCOM; $reorder=safe_get('reorder', '1', '0'); +$pid=$this->controller->indi->getXref(); // Get Javascript variables from lb_config.php --------------------------- require_once WT_ROOT.'modules/lightbox/lb_defaultconfig.php'; diff --git a/modules/lightbox/module.php b/modules/lightbox/module.php index 9e73c9fa1f..f2e805efac 100644 --- a/modules/lightbox/module.php +++ b/modules/lightbox/module.php @@ -80,11 +80,11 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul global $WORD_WRAPPED_NOTES, $MEDIA_DIRECTORY, $WT_IMAGES, $TEXT_DIRECTION, $is_media; global $cntm1, $cntm2, $cntm3, $cntm4, $t, $mgedrec ; global $edit ; - global $pid, $tabno; + global $tabno; global $Fam_Navigator, $NAV_ALBUM; ob_start(); - require_once 'modules/lightbox/functions/lb_head.php'; + require WT_ROOT.'modules/lightbox/functions/lb_head.php'; $media_found = false; if (!$this->controller->indi->canDisplayDetails()) { @@ -94,9 +94,7 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul echo "</td></tr>"; echo "</table>"; } else { - if (file_exists("modules/lightbox/album.php")) { - include_once('modules/lightbox/album.php'); - } + require WT_ROOT.'modules/lightbox/album.php'; } return '<div id="'.$this->getName().'_content">'.ob_get_clean().'</div>'; } |