diff options
Diffstat (limited to 'include/functions.inc.php')
| -rw-r--r-- | include/functions.inc.php | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php index 50348f029..16be2fca4 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -694,7 +694,7 @@ SELECT $result = pwg_query($query); while ($row = pwg_db_fetch_assoc($result)) { - if (file_exists($conf['themes_dir'].'/'.$row['id'].'/'.'themeconf.inc.php')) + if (check_theme_installed($row['id'])) { $themes[ $row['id'] ] = $row['name']; } @@ -706,6 +706,13 @@ SELECT return $themes; } +function check_theme_installed($theme_id) +{ + global $conf; + + return file_exists($conf['themes_dir'].'/'.$theme_id.'/'.'themeconf.inc.php'); +} + /* Returns the PATH to the thumbnail to be displayed. If the element does not * have a thumbnail, the default mime image path is returned. The PATH can be * used in the php script, but not sent to the browser. @@ -1148,8 +1155,12 @@ function get_filter_page_value($value_name) */ function get_pwg_charset() { - defined('PWG_CHARSET') or fatal_error('PWG_CHARSET undefined'); - return PWG_CHARSET; + $pwg_charset = 'utf-8'; + if (defined('PWG_CHARSET')) + { + $pwg_charset = PWG_CHARSET; + } + return $pwg_charset; } /** |