diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-02-10 14:55:05 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-02-10 17:47:01 +0000 |
| commit | fc41e65e0c4d6ebef9eab788496bddab70152db8 (patch) | |
| tree | 4eb78bd405e1de93a3c5e3199dc208c84fd244b1 | |
| parent | e52cd27f484148c2e452bbd606950fb1faeb0a61 (diff) | |
| download | webtrees-fc41e65e0c4d6ebef9eab788496bddab70152db8.tar.gz webtrees-fc41e65e0c4d6ebef9eab788496bddab70152db8.tar.bz2 webtrees-fc41e65e0c4d6ebef9eab788496bddab70152db8.zip | |
Missing globals in (unused) report code
| -rw-r--r-- | app/Report/ReportBase.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/Report/ReportBase.php b/app/Report/ReportBase.php index c129f23168..acbaaecf35 100644 --- a/app/Report/ReportBase.php +++ b/app/Report/ReportBase.php @@ -1365,7 +1365,7 @@ function gedcomValueStartHandler($attrs) { */ function repeatTagStartHandler($attrs) { // @deprecated - global $repeats, $repeatsStack, $gedrec, $repeatBytes, $parser, $processRepeats, $fact, $desc; + global $repeats, $repeatsStack, $gedrec, $repeatBytes, $parser, $processRepeats, $fact, $desc, $currentElement; $processRepeats++; if ($processRepeats > 1) { @@ -2255,7 +2255,7 @@ function lineStartHandler($attrs) { * @param array $attrs an array of key value pairs for the attributes */ function listStartHandler($attrs) { - global $gedrec, $repeats, $repeatBytes, $list, $repeatsStack, $processRepeats, $parser, $vars, $sortby; + global $gedrec, $repeats, $repeatBytes, $list, $fact, $desc, $repeatsStack, $processRepeats, $parser, $vars, $sortby; $processRepeats++; if ($processRepeats > 1) { @@ -2425,9 +2425,9 @@ function listStartHandler($attrs) { $value = "'" . $match[1] . "'"; } } elseif ($id == "fact") { - $value = "'$fact'"; + $value = "'" . $fact . "'"; } elseif ($id == "desc") { - $value = "'$desc'"; + $value = "'" . $desc . "'"; } else { if (preg_match("/\d $id (.+)/", $gedrec, $match)) { $value = "'" . str_replace("@", "", trim($match[1])) . "'"; @@ -3040,7 +3040,7 @@ function get_gedcom_value($tag, $level, $gedrec) { } $subrec = get_sub_record($level, "@ $t", $gedrec); if (empty($subrec)) { - return; + return ''; } } } |