diff options
| -rw-r--r-- | compact.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_print.php | 6 | ||||
| -rw-r--r-- | library/WT/Media.php | 8 | ||||
| -rw-r--r-- | modules_v3/tree/class_treeview.php | 5 |
4 files changed, 11 insertions, 10 deletions
diff --git a/compact.php b/compact.php index c2c25c7c01..c5e305f70a 100644 --- a/compact.php +++ b/compact.php @@ -294,7 +294,7 @@ function print_td_person($n) { $object=find_highlighted_object($pid, WT_GED_ID, $indi->getGedcomRecord()); $birth_date=$indi->getBirthDate(); $death_date=$indi->getDeathDate(); - $img_title=strip_tags($name.' - '.$birth_date->Display(false).' - '.$death_date->Display(false)); + $img_title=$name.' - '.$birth_date->Display(false).' - '.$death_date->Display(false); $img_id='box-'.$pid; if (!empty($object)) { $mediaobject=WT_Media::getInstance($object['mid']); diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index a5312a80af..4e4beb89da 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -226,18 +226,16 @@ function print_pedigree_person($person, $style=1, $count=0, $personcount="1") { $name = $person->getFullName(); if ($SHOW_HIGHLIGHT_IMAGES) { $object=$person->findHighlightedMedia(); - $img_title=strip_tags($name); $img_id='box-'.$boxID.'.-thumb'; if (!empty($object)) { $mediaobject=WT_Media::getInstance($object['mid']); - $thumbnail=$mediaobject->displayMedia(array('display_type'=>'pedigree_person','img_id'=>$img_id,'img_title'=>$img_title,'show_full'=>$show_full)); + $thumbnail=$mediaobject->displayMedia(array('display_type'=>'pedigree_person','img_id'=>$img_id,'img_title'=>$name,'show_full'=>$show_full)); } else { - $thumbnail=display_silhouette(array('sex'=>$person->getSex(),'display_type'=>'pedigree_person','img_id'=>$img_id,'img_title'=>$img_title,'show_full'=>$show_full)); // may return '' + $thumbnail=display_silhouette(array('sex'=>$person->getSex(),'display_type'=>'pedigree_person','img_id'=>$img_id,'img_title'=>$name,'show_full'=>$show_full)); // may return '' } } //-- find additional name $addname=$person->getAddName(); - $name = PrintReady($name); // add optional CSS style for each fact $indirec = $person->getGedcomRecord(); diff --git a/library/WT/Media.php b/library/WT/Media.php index 54db352e49..56f89d41b2 100644 --- a/library/WT/Media.php +++ b/library/WT/Media.php @@ -479,7 +479,9 @@ class WT_Media extends WT_GedcomRecord { $urltype = get_url_type($this->getLocalFilename()); $notes=($this->getNote()) ? htmlspecialchars(print_fact_notes("1 NOTE ".$this->getNote(), 1, true, true)) : ''; - if (!$config['img_title']) { + if ($config['img_title']) { + $config['img_title']=strip_tags($config['img_title']); + } else { $config['img_title']=strip_tags($this->getFullName()); } @@ -655,7 +657,9 @@ class WT_Media extends WT_GedcomRecord { $idstr=($config['img_id']) ? 'id="'.$config['img_id'].'"' : ''; $alignstr=($config['align']=='auto') ? 'align="'.($TEXT_DIRECTION=="rtl" ? "right":"left").'"' : ''; $stylestr=($config['show_full']) ? '' : ' style="display: none;" '; - if (!$config['img_title']) { + if ($config['img_title']) { + $config['img_title']=strip_tags($config['img_title']); + } else { $config['img_title']=strip_tags($this->getFullName()); } $sizestr=''; diff --git a/modules_v3/tree/class_treeview.php b/modules_v3/tree/class_treeview.php index 0c7ea2afc0..c8db0a6307 100644 --- a/modules_v3/tree/class_treeview.php +++ b/modules_v3/tree/class_treeview.php @@ -420,12 +420,11 @@ class TreeView { $thumbnail=""; if ($SHOW_HIGHLIGHT_IMAGES) { $object=$person->findHighlightedMedia(); - $img_title=strip_tags($person->getFullName()); if (!empty($object)) { $mediaobject=WT_Media::getInstance($object['mid']); - $thumbnail=$mediaobject->displayMedia(array('display_type'=>'treeview','img_title'=>$img_title,'clearbox'=>'tvlb'.$personGroup->getXref())); + $thumbnail=$mediaobject->displayMedia(array('display_type'=>'treeview','img_title'=>$person->getFullName(),'clearbox'=>'tvlb'.$personGroup->getXref())); } else { - $thumbnail=display_silhouette(array('sex'=>$person->getSex(),'display_type'=>'treeview','img_title'=>$img_title)); // may return '' + $thumbnail=display_silhouette(array('sex'=>$person->getSex(),'display_type'=>'treeview','img_title'=>$person->getFullName())); // may return '' } } |