diff options
27 files changed, 9 insertions, 30 deletions
diff --git a/editconfig_gedcom.php b/editconfig_gedcom.php index aca0da1319..754f637253 100644 --- a/editconfig_gedcom.php +++ b/editconfig_gedcom.php @@ -157,7 +157,6 @@ case 'update': set_gedcom_setting(WT_GED_ID, 'FAM_FACTS_QUICK', safe_POST('NEW_FAM_FACTS_QUICK')); set_gedcom_setting(WT_GED_ID, 'FAM_FACTS_UNIQUE', safe_POST('NEW_FAM_FACTS_UNIQUE')); set_gedcom_setting(WT_GED_ID, 'FAM_ID_PREFIX', safe_POST('NEW_FAM_ID_PREFIX')); - set_gedcom_setting(WT_GED_ID, 'FAVICON', safe_POST('NEW_FAVICON')); set_gedcom_setting(WT_GED_ID, 'FULL_SOURCES', safe_POST_bool('NEW_FULL_SOURCES')); set_gedcom_setting(WT_GED_ID, 'GEDCOM_DEFAULT_TAB', safe_POST('NEW_GEDCOM_DEFAULT_TAB')); set_gedcom_setting(WT_GED_ID, 'GEDCOM_ID_PREFIX', safe_POST('NEW_GEDCOM_ID_PREFIX')); @@ -663,12 +662,6 @@ print_header(i18n::translate('GEDCOM configuration')); <td class="optionbox width60"><input type="text" dir="ltr" name="NEW_META_DESCRIPTION" value="<?php echo get_gedcom_setting(WT_GED_ID, 'META_DESCRIPTION'); ?>" tabindex="<?php echo ++$i; ?>" /><br /> <?php print i18n::translate('Leave this field empty to use the title of the currently active database.'); ?></td> </tr> - </tr> - <td class="descriptionbox nowrap"> - <?php echo i18n::translate('Favorites icon'), help_link('FAVICON'); ?> - </td> - <td class="optionbox width60"><input type="text" dir="ltr" name="NEW_FAVICON" value="<?php echo get_gedcom_setting(WT_GED_ID, 'FAVICON'); ?>" tabindex="<?php echo ++$i; ?>" /></td> - </tr> <tr> <td class="descriptionbox nowrap"> <?php echo i18n::translate('Robots META tag'), help_link('META_ROBOTS'); ?> diff --git a/help_text.php b/help_text.php index 13d47e1254..e6cd220642 100644 --- a/help_text.php +++ b/help_text.php @@ -2206,11 +2206,6 @@ case 'FAM_ID_PREFIX': $text=i18n::translate('When a new family record is added online in <b>webtrees</b>, a new ID for that family will be generated automatically. The family ID will have this prefix.'); break; -case 'FAVICON': - $title=i18n::translate('Favorites icon'); - $text=i18n::translate('Change this to point to the icon you want to display in peoples\' favorites menu when they bookmark your site.'); - break; - case 'FULL_SOURCES': $title=i18n::translate('Use full source citations'); $text=i18n::translate('Source citations can include fields to record the quality of the data (primary, secondary, etc.) and the date the event was recorded in the source. If you don\'t use these fields, you can disable them when creating new source citations.'); diff --git a/images/favicon.ico b/images/favicon.ico Binary files differdeleted file mode 100644 index 053c0d570b..0000000000 --- a/images/favicon.ico +++ /dev/null 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"); diff --git a/includes/session.php b/includes/session.php index 24fe961e6d..c1f653b184 100644 --- a/includes/session.php +++ b/includes/session.php @@ -42,7 +42,7 @@ define('WT_TRANSLATORS_URL', 'https://translations.launchpad.net/webtrees'); // Enable debugging output? define('WT_DEBUG', false); -define('WT_DEBUG_SQL', false); +define('WT_DEBUG_SQL', true); // Error reporting define('WT_ERROR_LEVEL', 2); // 0=none, 1=minimal, 2=full diff --git a/includes/set_gedcom_defaults.php b/includes/set_gedcom_defaults.php index 2fe074ebe7..a8fe08edac 100644 --- a/includes/set_gedcom_defaults.php +++ b/includes/set_gedcom_defaults.php @@ -62,7 +62,6 @@ set_gedcom_setting($ged_id, 'FAM_FACTS_ADD', 'CENS,MARR,RESI,SLGS set_gedcom_setting($ged_id, 'FAM_FACTS_QUICK', 'MARR,DIV,_NMR'); set_gedcom_setting($ged_id, 'FAM_FACTS_UNIQUE', 'NCHI,MARL,DIV,ANUL,DIVF,ENGA,MARB,MARC,MARS'); set_gedcom_setting($ged_id, 'FAM_ID_PREFIX', 'F'); -set_gedcom_setting($ged_id, 'FAVICON', 'images/favicon.ico'); set_gedcom_setting($ged_id, 'FULL_SOURCES', false); set_gedcom_setting($ged_id, 'GEDCOM_DEFAULT_TAB', 'personal_facts'); set_gedcom_setting($ged_id, 'GEDCOM_ID_PREFIX', 'I'); diff --git a/opensearch.php b/opensearch.php index 34918ad10c..6aa86c5932 100644 --- a/opensearch.php +++ b/opensearch.php @@ -36,6 +36,6 @@ echo '<Description>' . get_gedcom_setting(WT_GED_ID, 'title') . ' ' . i18n::tra echo '<InputEncoding>UTF-8</InputEncoding>'; echo '<Url type="text/html" template="' . WT_SERVER_NAME.WT_SCRIPT_PATH. 'search.php?action=general&topsearch=yes&query={searchTerms}"/>'; echo '<Url type="application/x-suggestions+json" template="' . WT_SERVER_NAME.WT_SCRIPT_PATH. 'autocomplete.php?limit=20&field=NAME&fmt=json&q={searchTerms}"/>'; -echo'<Image height="16" width="16" type="image/x-icon">' . WT_SERVER_NAME.WT_SCRIPT_PATH. $FAVICON . '</Image>'; +echo'<Image height="16" width="16" type="image/x-icon">' . WT_SERVER_NAME.WT_SCRIPT_PATH . 'favicon.ico</Image>'; echo '</OpenSearchDescription>'; ?> diff --git a/pgv_to_wt.php b/pgv_to_wt.php index ec128ca741..fed77831f8 100644 --- a/pgv_to_wt.php +++ b/pgv_to_wt.php @@ -444,7 +444,6 @@ foreach (get_all_gedcoms() as $ged_id=>$gedcom) { @set_gedcom_setting($ged_id, 'FAM_FACTS_QUICK', $FAM_FACTS_QUICK); @set_gedcom_setting($ged_id, 'FAM_FACTS_UNIQUE', $FAM_FACTS_UNIQUE); @set_gedcom_setting($ged_id, 'FAM_ID_PREFIX', $FAM_ID_PREFIX); - @set_gedcom_setting($ged_id, 'FAVICON', $FAVICON); @set_gedcom_setting($ged_id, 'FULL_SOURCES', $FULL_SOURCES); @set_gedcom_setting($ged_id, 'GEDCOM_DEFAULT_TAB', $GEDCOM_DEFAULT_TAB); @set_gedcom_setting($ged_id, 'GEDCOM_ID_PREFIX', $GEDCOM_ID_PREFIX); diff --git a/themes/clouds/header.php b/themes/clouds/header.php index 1ab7e4d55e..4a9a1675fc 100644 --- a/themes/clouds/header.php +++ b/themes/clouds/header.php @@ -48,7 +48,7 @@ echo '<html xmlns="http://www.w3.org/1999/xhtml" ', i18n::html_markup(), '>', '<head>', '<title>', htmlspecialchars($GEDCOM_TITLE), '</title>', - '<link rel="shortcut icon" href="', $FAVICON, '" type="image/x-icon">'; + '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">'; if (WT_USE_LIGHTBOX) { if ($TEXT_DIRECTION=='rtl') { diff --git a/themes/clouds/images/favicon.ico b/themes/clouds/images/favicon.ico Binary files differdeleted file mode 100644 index 053c0d570b..0000000000 --- a/themes/clouds/images/favicon.ico +++ /dev/null diff --git a/themes/clouds/theme.php b/themes/clouds/theme.php index 2c09ef73f3..3828c3449b 100644 --- a/themes/clouds/theme.php +++ b/themes/clouds/theme.php @@ -40,7 +40,6 @@ $print_stylesheet = WT_THEME_DIR . 'print.css'; $headerfile = WT_THEME_DIR . 'header.php'; $rtl_stylesheet = WT_THEME_DIR . 'style_rtl.css'; $footerfile = WT_THEME_DIR . 'footer.php'; -$FAVICON = WT_THEME_DIR . 'images/favicon.ico'; $WT_USE_HELPIMG = true; $WT_MENU_LOCATION = 'top'; diff --git a/themes/colors/header.php b/themes/colors/header.php index 5b8a226aa9..7c9481ce1f 100644 --- a/themes/colors/header.php +++ b/themes/colors/header.php @@ -49,7 +49,7 @@ echo '<html xmlns="http://www.w3.org/1999/xhtml" ', i18n::html_markup(), '>', '<head>', '<title>', htmlspecialchars($title), '</title>', - '<link rel="shortcut icon" href="', $FAVICON, '" type="image/x-icon">'; + '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">'; if (WT_USE_LIGHTBOX) { if ($TEXT_DIRECTION=='rtl') { diff --git a/themes/colors/images/favicon.ico b/themes/colors/images/favicon.ico Binary files differdeleted file mode 100644 index 053c0d570b..0000000000 --- a/themes/colors/images/favicon.ico +++ /dev/null diff --git a/themes/colors/theme.php b/themes/colors/theme.php index 70274eee27..9ac59782a7 100644 --- a/themes/colors/theme.php +++ b/themes/colors/theme.php @@ -95,7 +95,6 @@ if (isset($_GET['themecolor']) && array_key_exists($_GET['themecolor'], $COLOR_T $_SESSION['themecolor']=$subColor; $theme_name = "colors"; // need double quotes, as file is scanned/parsed by script -$FAVICON = WT_THEME_DIR . 'images/favicon.ico'; $footerfile = WT_THEME_DIR . 'footer.php'; $headerfile = WT_THEME_DIR . 'header.php'; $modules = WT_THEME_DIR . 'modules.css'; diff --git a/themes/fab/header.php b/themes/fab/header.php index e2c82b9150..6848ba281f 100644 --- a/themes/fab/header.php +++ b/themes/fab/header.php @@ -45,7 +45,7 @@ echo '<html xmlns="http://www.w3.org/1999/xhtml" ', i18n::html_markup(), '>', '<head>', '<title>', htmlspecialchars($title), '</title>', - '<link rel="shortcut icon" href="', $FAVICON, '" type="image/x-icon">', + '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">', '<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />'; if (WT_USE_LIGHTBOX) { diff --git a/themes/fab/images/favicon.ico b/themes/fab/images/favicon.ico Binary files differdeleted file mode 100644 index 053c0d570b..0000000000 --- a/themes/fab/images/favicon.ico +++ /dev/null diff --git a/themes/fab/theme.php b/themes/fab/theme.php index 6c50f87d86..6b027a1587 100644 --- a/themes/fab/theme.php +++ b/themes/fab/theme.php @@ -40,7 +40,6 @@ $theme_name = "F.A.B."; // need double quotes, as file is scanned/parsed b $stylesheet = WT_THEME_DIR.'style.css'; $headerfile = WT_THEME_DIR.'header.php'; $footerfile = WT_THEME_DIR.'footer.php'; -$FAVICON = WT_THEME_DIR.'images/favicon.ico'; $WT_USE_HELPIMG = false; $WT_MENU_LOCATION = 'top'; diff --git a/themes/minimal/header.php b/themes/minimal/header.php index e17567101c..ae9be0104e 100644 --- a/themes/minimal/header.php +++ b/themes/minimal/header.php @@ -39,7 +39,7 @@ if (!defined('WT_WEBTREES')) { <?php if (isset($_GET["mod_action"]) && $_GET["mod_action"]=="places_edit") { ?> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> <?php } ?> - <?php if ($FAVICON) { ?><link rel="shortcut icon" href="<?php echo $FAVICON; ?>" type="image/x-icon" /> <?php } ?> + <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> <title><?php htmlspecialchars($title); ?></title> <link rel="stylesheet" href="<?php echo $stylesheet; ?>" type="text/css" media="all" /> diff --git a/themes/minimal/images/favicon.ico b/themes/minimal/images/favicon.ico Binary files differdeleted file mode 100644 index 053c0d570b..0000000000 --- a/themes/minimal/images/favicon.ico +++ /dev/null diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php index 53c77ee929..7b2df4b216 100644 --- a/themes/minimal/theme.php +++ b/themes/minimal/theme.php @@ -38,7 +38,6 @@ $rtl_stylesheet = WT_THEME_DIR.'style_rtl.css'; $print_stylesheet = WT_THEME_DIR.'print.css'; $headerfile = WT_THEME_DIR.'header.php'; $footerfile = WT_THEME_DIR.'footer.php'; -$FAVICON = WT_THEME_DIR.'images/favicon.ico'; $WT_USE_HELPIMG = false; //-- variables for image names diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php index c43847e471..07314f972c 100644 --- a/themes/webtrees/header.php +++ b/themes/webtrees/header.php @@ -37,7 +37,7 @@ echo '<html xmlns="http://www.w3.org/1999/xhtml" ', i18n::html_markup(), '>', '<head>', '<title>', htmlspecialchars($title), '</title>', - '<link rel="shortcut icon" href="', $FAVICON, '" type="image/x-icon" />', + '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />', '<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />'; diff --git a/themes/webtrees/images/favicon.ico b/themes/webtrees/images/favicon.ico Binary files differdeleted file mode 100644 index 053c0d570b..0000000000 --- a/themes/webtrees/images/favicon.ico +++ /dev/null diff --git a/themes/webtrees/theme.php b/themes/webtrees/theme.php index 18603b0425..092ba4ecee 100644 --- a/themes/webtrees/theme.php +++ b/themes/webtrees/theme.php @@ -41,7 +41,6 @@ $print_stylesheet = WT_THEME_DIR.'print.css'; $toplinks = WT_THEME_DIR.'toplinks.php'; $headerfile = WT_THEME_DIR.'header.php'; $footerfile = WT_THEME_DIR.'footer.php'; -$FAVICON = WT_THEME_DIR.'images/favicon.ico'; $WT_USE_HELPIMG = true; $WT_MENU_LOCATION = 'top'; diff --git a/themes/xenea/header.php b/themes/xenea/header.php index 1b870bbf46..b8aa1824ff 100644 --- a/themes/xenea/header.php +++ b/themes/xenea/header.php @@ -43,7 +43,7 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA <?php if (isset($_GET["mod_action"]) && $_GET["mod_action"]=="places_edit") { ?> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> <?php } ?> - <?php if ($FAVICON) { ?><link rel="shortcut icon" href="<?php echo $FAVICON; ?>" type="image/x-icon" /> <?php } ?> + <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> <title><?php echo htmlspecialchars($title); ?></title> <link rel="stylesheet" href="<?php echo $stylesheet; ?>" type="text/css" media="all" /> diff --git a/themes/xenea/images/favicon.ico b/themes/xenea/images/favicon.ico Binary files differdeleted file mode 100644 index 053c0d570b..0000000000 --- a/themes/xenea/images/favicon.ico +++ /dev/null diff --git a/themes/xenea/theme.php b/themes/xenea/theme.php index 6873917baf..8e0d5c8145 100644 --- a/themes/xenea/theme.php +++ b/themes/xenea/theme.php @@ -38,7 +38,6 @@ $rtl_stylesheet = WT_THEME_DIR.'style_rtl.css'; $print_stylesheet = WT_THEME_DIR.'print.css'; $headerfile = WT_THEME_DIR.'header.php'; $footerfile = WT_THEME_DIR.'footer.php'; -$FAVICON = WT_THEME_DIR.'images/favicon.ico'; $WT_USE_HELPIMG = true; //-- variables for image names |