diff options
Diffstat (limited to 'includes/functions')
| -rw-r--r-- | includes/functions/functions.php | 1 | ||||
| -rw-r--r-- | includes/functions/functions_print.php | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/includes/functions/functions.php b/includes/functions/functions.php index ddc5be20a3..3034b6719a 100644 --- a/includes/functions/functions.php +++ b/includes/functions/functions.php @@ -267,7 +267,6 @@ function load_gedcom_settings($ged_id=WT_GED_ID) { global $SAVE_WATERMARK_THUMB; $SAVE_WATERMARK_THUMB =get_gedcom_setting($ged_id, 'SAVE_WATERMARK_THUMB'); global $SEARCH_FACTS_DEFAULT; $SEARCH_FACTS_DEFAULT =get_gedcom_setting($ged_id, 'SEARCH_FACTS_DEFAULT'); global $SHOW_AGE_DIFF; $SHOW_AGE_DIFF =get_gedcom_setting($ged_id, 'SHOW_AGE_DIFF'); - global $SHOW_CONTEXT_HELP; $SHOW_CONTEXT_HELP =get_gedcom_setting($ged_id, 'SHOW_CONTEXT_HELP'); global $SHOW_COUNTER; $SHOW_COUNTER =get_gedcom_setting($ged_id, 'SHOW_COUNTER'); global $SHOW_DEAD_PEOPLE; $SHOW_DEAD_PEOPLE =get_gedcom_setting($ged_id, 'SHOW_DEAD_PEOPLE'); global $SHOW_EMPTY_BOXES; $SHOW_EMPTY_BOXES =get_gedcom_setting($ged_id, 'SHOW_EMPTY_BOXES'); diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 61eeaf00e5..9ef81f70b0 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -1221,13 +1221,13 @@ function print_privacy_error() { function help_link($help_topic, $module='') { global $WT_USE_HELPIMG, $WT_IMAGES, $WT_IMAGE_DIR, $SEARCH_SPIDER; - if ($SEARCH_SPIDER || !$_SESSION['show_context_help']) { - return ''; - } else { + if ($_SESSION['show_context_help']) { return '<a class="help" tabindex="0" href="javascript: '.$help_topic.'" onclick="helpPopup(\''.$help_topic.'\',\''.$module.'\'); return false;"> '. ($WT_USE_HELPIMG ? '<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['help']['small'].'" class="icon" width="15" height="15" alt="" />' : i18n::translate('?')). ' </a>'; + } else { + return ''; } } |