diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-12-30 15:05:42 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-12-30 15:05:42 +0000 |
| commit | ecbc6db9fae9112dbb21cd9aedbc3b123979526e (patch) | |
| tree | f762e8db15caa7e9bcb4071a4f58e28a64fa8a1b /includes | |
| parent | acb9cd4f9a99a53b76ab4787a067583c10da002c (diff) | |
| download | webtrees-ecbc6db9fae9112dbb21cd9aedbc3b123979526e.tar.gz webtrees-ecbc6db9fae9112dbb21cd9aedbc3b123979526e.tar.bz2 webtrees-ecbc6db9fae9112dbb21cd9aedbc3b123979526e.zip | |
Use constant WT_THEME_DIR instead of global variable $THEME_DIR
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/functions/functions.php | 1 | ||||
| -rw-r--r-- | includes/functions/functions_print.php | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/includes/functions/functions.php b/includes/functions/functions.php index ec920b8d6c..c536a5ef8c 100644 --- a/includes/functions/functions.php +++ b/includes/functions/functions.php @@ -305,7 +305,6 @@ function load_gedcom_settings($ged_id=WT_GED_ID) { global $SOURCE_ID_PREFIX; $SOURCE_ID_PREFIX =get_gedcom_setting($ged_id, 'SOURCE_ID_PREFIX'); global $SPLIT_PLACES; $SPLIT_PLACES =get_gedcom_setting($ged_id, 'SPLIT_PLACES'); global $SURNAME_LIST_STYLE; $SURNAME_LIST_STYLE =get_gedcom_setting($ged_id, 'SURNAME_LIST_STYLE'); - global $THEME_DIR; $THEME_DIR =get_gedcom_setting($ged_id, 'THEME_DIR'); global $THUMBNAIL_WIDTH; $THUMBNAIL_WIDTH =get_gedcom_setting($ged_id, 'THUMBNAIL_WIDTH'); global $UNDERLINE_NAME_QUOTES; $UNDERLINE_NAME_QUOTES =get_gedcom_setting($ged_id, 'UNDERLINE_NAME_QUOTES'); global $USE_GEONAMES; $USE_GEONAMES =get_gedcom_setting($ged_id, 'USE_GEONAMES'); diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 7da6ccb775..13a5b374e3 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -357,8 +357,7 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") { } } } - global $THEME_DIR; - require $THEME_DIR.'templates/personbox_template.php'; + require WT_THEME_DIR.'templates/personbox_template.php'; } /** @@ -375,7 +374,7 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") { function print_header($title) { global $bwidth, $BROWSERTYPE, $SEARCH_SPIDER, $view, $cart; global $GEDCOM, $GEDCOM_TITLE, $action, $query, $theme_name; - global $stylesheet, $print_stylesheet, $rtl_stylesheet, $headerfile, $THEME_DIR, $print_headerfile; + global $stylesheet, $print_stylesheet, $rtl_stylesheet, $headerfile, $print_headerfile; global $WT_IMAGES, $TEXT_DIRECTION, $REQUIRE_AUTHENTICATION; header('Content-Type: text/html; charset=UTF-8'); |