summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2011-10-28 23:09:00 +0000
committerfisharebest <fisharebest@gmail.com>2011-10-28 23:09:00 +0000
commit511c01d1005c3dccc2931946b1f4dfb86028f0ae (patch)
tree840c2f0ebfc9f4a5241a3b8a932baa65175c1687 /includes
parent12bb71419bf205bcacbd9cb9ae9a68b83da609dd (diff)
downloadwebtrees-511c01d1005c3dccc2931946b1f4dfb86028f0ae.tar.gz
webtrees-511c01d1005c3dccc2931946b1f4dfb86028f0ae.tar.bz2
webtrees-511c01d1005c3dccc2931946b1f4dfb86028f0ae.zip
#883304 - The home page URL does not include the GEDCOM
Remove unused parameters from PrintReady()
Diffstat (limited to 'includes')
-rw-r--r--includes/functions/functions_print.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 99b854c342..54f4814b5a 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -809,9 +809,10 @@ function print_fact_notes($factrec, $level, $textOnly=false, $return=false) {
* gedcom Home Page
* @author John Finlay
*/
-function print_gedcom_title_link($InHeader=FALSE) {
+function print_gedcom_title_link() {
global $GEDCOM_TITLE;
- echo "<a href=\"index.php?ctype=gedcom\" class=\"gedcomtitle\">", PrintReady($GEDCOM_TITLE, $InHeader), "</a>";
+
+ echo '<a href="index.php?ctype=gedcom&amp;ged=', WT_GEDURL,'" class="gedcomtitle">', PrintReady($GEDCOM_TITLE), '</a>';
}
//-- function to print a privacy error with contact method
@@ -922,16 +923,12 @@ function highlight_search_hits($string) {
*
* @param string $text to be printed
*/
-function PrintReady($text, $InHeaders=false, $trim=true) {
- global $action, $firstname, $lastname, $place, $year;
- global $TEXT_DIRECTION_array, $TEXT_DIRECTION;
-
+function PrintReady($text) {
//-- convert all & to &amp;
$text = str_replace("&", "&amp;", $text);
//$text = preg_replace(array("/&/", "/</", "/>/"), array("&amp;", "&lt;", "&gt;"), $text);
//-- make sure we didn't double convert existing HTML entities like so: &foo; to &amp;foo;
$text = preg_replace("/&amp;(\w+);/", "&$1;", $text);
- if ($trim) $text = trim($text);
// Look for strings enclosed in parentheses, braces, or brackets.
//