diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-07-23 21:12:18 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-07-23 21:12:18 +0000 |
| commit | ca787d685ed357b66c9817d1c08881675b57905f (patch) | |
| tree | daa28bc50980cdc1e86a5732d8e73f9689816ecd /includes/functions | |
| parent | 8645a307802c095ee88dd4ee1c032c89a3ef06df (diff) | |
| download | webtrees-ca787d685ed357b66c9817d1c08881675b57905f.tar.gz webtrees-ca787d685ed357b66c9817d1c08881675b57905f.tar.bz2 webtrees-ca787d685ed357b66c9817d1c08881675b57905f.zip | |
Remove conflicting gedcom/theme settings for favicon.ico and remove duplicated files.
Diffstat (limited to 'includes/functions')
| -rw-r--r-- | includes/functions/functions.php | 1 | ||||
| -rw-r--r-- | includes/functions/functions_print.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/includes/functions/functions.php b/includes/functions/functions.php index be0ce904be..3ba67efe19 100644 --- a/includes/functions/functions.php +++ b/includes/functions/functions.php @@ -202,7 +202,6 @@ function load_gedcom_settings($ged_id=WT_GED_ID) { global $EXPAND_RELATIVES_EVENTS; $EXPAND_RELATIVES_EVENTS =get_gedcom_setting($ged_id, 'EXPAND_RELATIVES_EVENTS'); global $EXPAND_SOURCES; $EXPAND_SOURCES =get_gedcom_setting($ged_id, 'EXPAND_SOURCES'); global $FAM_ID_PREFIX; $FAM_ID_PREFIX =get_gedcom_setting($ged_id, 'FAM_ID_PREFIX'); - global $FAVICON; $FAVICON =get_gedcom_setting($ged_id, 'FAVICON'); global $FULL_SOURCES; $FULL_SOURCES =get_gedcom_setting($ged_id, 'FULL_SOURCES'); global $GEDCOM_DEFAULT_TAB; $GEDCOM_DEFAULT_TAB =get_gedcom_setting($ged_id, 'GEDCOM_DEFAULT_TAB'); global $GEDCOM_ID_PREFIX; $GEDCOM_ID_PREFIX =get_gedcom_setting($ged_id, 'GEDCOM_ID_PREFIX'); diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 7b69bb4e40..da95fe4ae2 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -404,7 +404,7 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") { function print_header($title, $head="", $use_alternate_styles=true) { global $bwidth, $HOME_SITE_URL, $HOME_SITE_TEXT, $BROWSERTYPE, $SEARCH_SPIDER, $view, $cart; global $GEDCOM, $GEDCOM_TITLE, $QUERY_STRING, $action, $query, $theme_name; - global $FAVICON, $stylesheet, $print_stylesheet, $rtl_stylesheet, $headerfile, $toplinks, $THEME_DIR, $print_headerfile; + global $stylesheet, $print_stylesheet, $rtl_stylesheet, $headerfile, $toplinks, $THEME_DIR, $print_headerfile; global $WT_IMAGES, $TEXT_DIRECTION, $ONLOADFUNCTION, $REQUIRE_AUTHENTICATION; header("Content-Type: text/html; charset=UTF-8"); |