#708463 - Undefined index: m_gedfile when linking media

12 files changed, 17 insertions, 30 deletions

diff --git a/modules/lightbox/album.php b/modules/lightbox/album.php
index 3726d1f013..b72ef1425b 100644
--- a/modules/lightbox/album.php
+++ b/modules/lightbox/album.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox
  *
diff --git a/modules/lightbox/css/album_page.css b/modules/lightbox/css/album_page.css
index cf64b34c9e..632302ab51 100644
--- a/modules/lightbox/css/album_page.css
+++ b/modules/lightbox/css/album_page.css
@@ -1,5 +1,5 @@
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox
   *
diff --git a/modules/lightbox/css/album_page_RTL.css b/modules/lightbox/css/album_page_RTL.css
index eadfb34d0a..979226c12a 100644
--- a/modules/lightbox/css/album_page_RTL.css
+++ b/modules/lightbox/css/album_page_RTL.css
@@ -1,5 +1,5 @@
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox
   *
diff --git a/modules/lightbox/css/album_page_RTL2.css b/modules/lightbox/css/album_page_RTL2.css
index eadfb34d0a..979226c12a 100644
--- a/modules/lightbox/css/album_page_RTL2.css
+++ b/modules/lightbox/css/album_page_RTL2.css
@@ -1,5 +1,5 @@
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox
   *
diff --git a/modules/lightbox/css/album_page_RTL_ff.css b/modules/lightbox/css/album_page_RTL_ff.css
index 693f308e03..a390e8b707 100644
--- a/modules/lightbox/css/album_page_RTL_ff.css
+++ b/modules/lightbox/css/album_page_RTL_ff.css
@@ -1,5 +1,5 @@
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox
   *
diff --git a/modules/lightbox/functions/lb_call_js.php b/modules/lightbox/functions/lb_call_js.php
index 4a533c4be5..f96c8ae627 100644
--- a/modules/lightbox/functions/lb_call_js.php
+++ b/modules/lightbox/functions/lb_call_js.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox
  *
diff --git a/modules/lightbox/functions/lb_head.php b/modules/lightbox/functions/lb_head.php
index 1d30ddee56..e975c85faf 100644
--- a/modules/lightbox/functions/lb_head.php
+++ b/modules/lightbox/functions/lb_head.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox 4.1
  *
diff --git a/modules/lightbox/functions/lb_link.php b/modules/lightbox/functions/lb_link.php
index 18f47a246b..33a08fe7d4 100644
--- a/modules/lightbox/functions/lb_link.php
+++ b/modules/lightbox/functions/lb_link.php
@@ -1,5 +1,5 @@
 <?php
-// Lightbox Album module for phpGedView
+// Lightbox Album module for webtrees
 //
 // Display media Items using Lightbox
 //
diff --git a/modules/lightbox/functions/lightbox_print_media.php b/modules/lightbox/functions/lightbox_print_media.php
index 46c74a1191..4b6c482237 100644
--- a/modules/lightbox/functions/lightbox_print_media.php
+++ b/modules/lightbox/functions/lightbox_print_media.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox
  *
@@ -305,32 +305,19 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 					$row = array();
 					$newrec = find_gedcom_record($media_id, $ged_id, true);
 					$row['m_media'] = $media_id;
+					$row['m_gedfile']=$ged_id;
 					$row['m_file'] = get_gedcom_value("FILE", 1, $newrec);
 					$row['m_titl'] = get_gedcom_value("TITL", 1, $newrec);
-					if (empty($row['m_titl'])) {
-						$row['m_titl'] = get_gedcom_value("FILE:TITL", 1, $newrec);
-					}
+					if (empty($row['m_titl'])) $row['m_titl'] = get_gedcom_value("FILE:TITL", 1, $newrec);
 					$row['m_gedrec'] = $newrec;
 					$et = preg_match("/(\.\w+)$/", $row['m_file'], $ematch);
 					$ext = "";
-					if ($et>0) {
-						$ext = substr(trim($ematch[1]), 1);
-					}
+					if ($et>0) $ext = substr(trim($ematch[1]), 1);
 					$row['m_ext'] = $ext;
 					$row['mm_gid'] = $pid;
 					$row['mm_gedrec'] = get_sub_record($objSubrec{0}, $objSubrec, $gedrec);
-					if ($newrec && isset($rowm['m_file'])) {
-						// -----
-					} else {
-						echo "<li class=\"li_new\" >";
-						echo "<center><table class=\"pic\" border=\"0\" ></center>";
-						echo "<tr><td align=\"center\" colspan=\"4\">";
-						echo $row['m_media'];
-						echo "</td></tr>";
-
-						$res =  lightbox_print_media_row('new', $row, $pid);
-						$media_found = $media_found || $res;
-					}
+					$res = lightbox_print_media_row('new', $row, $pid);
+					$media_found = $media_found || $res;
 					$value--;
 				}
 			}
diff --git a/modules/lightbox/functions/lightbox_print_media_row.php b/modules/lightbox/functions/lightbox_print_media_row.php
index ef3483b3ae..9abe90e322 100644
--- a/modules/lightbox/functions/lightbox_print_media_row.php
+++ b/modules/lightbox/functions/lightbox_print_media_row.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox 4.1
  *
diff --git a/modules/lightbox/js/clsource_music.js b/modules/lightbox/js/clsource_music.js
index 3f4720e0e7..8e1577e70d 100644
--- a/modules/lightbox/js/clsource_music.js
+++ b/modules/lightbox/js/clsource_music.js
@@ -1089,7 +1089,7 @@ var CB_Close_Win		= CB_Close_Win;
 		CB_preImages.src = CB_Gallery[CB_ActImgId][0];
 		CB_Loaded = false;
 //		CB_preImages.onerror = function () {CB_ShowImage();alert("ClearBox ERROR:\n\nCould not open Image: " + CB_Gallery[CB_ActImgId][0]);return;};
-		CB_preImages.onerror = function () {CB_ShowImage();alert("ClearBox ERROR:\n\nCould not open Image : " );return;};
+		CB_preImages.onerror = function () {CB_ShowImage();alert("Lightbox ERROR:\n\nCould not open Image : " );return;};
 		CB_CheckLoaded();
 //		resetZoom();
 	}
diff --git a/modules/lightbox/lb_defaultconfig.php b/modules/lightbox/lb_defaultconfig.php
index 3b81b8f738..9b9392b207 100644
--- a/modules/lightbox/lb_defaultconfig.php
+++ b/modules/lightbox/lb_defaultconfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Lightbox Album module for phpGedView
+ * Lightbox Album module for webtrees
  *
  * Display media Items using Lightbox
  *