diff options
Diffstat (limited to 'include/functions.inc.php')
| -rw-r--r-- | include/functions.inc.php | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php index 0a93d3927..551ad72c0 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -32,18 +32,6 @@ include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' ); include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' ); //----------------------------------------------------------- generic functions -function get_extra_fields($order_by_fields) -{ - $fields = str_ireplace(array(' order by ', ' desc', ' asc'), - array('', '', ''), - $order_by_fields - ); - if (!empty($fields)) - { - $fields = ','.$fields; - } - return $fields; -} // The function get_moment returns a float value coresponding to the number // of seconds since the unix epoch (1st January 1970) and the microseconds @@ -583,7 +571,7 @@ function redirect_html( $url , $msg = '', $refresh_time = 0) { global $user, $template, $lang_info, $conf, $lang, $t2, $page, $debug; - if (!isset($lang_info)) + if (!isset($lang_info) || !isset($template) ) { $user = build_user( $conf['guest_id'], true); load_language('common.lang'); @@ -591,10 +579,6 @@ function redirect_html( $url , $msg = '', $refresh_time = 0) load_language('lang', PHPWG_ROOT_PATH.'local/', array('no_fallback'=>true, 'local'=>true) ); $template = new Template(PHPWG_ROOT_PATH.'themes', get_default_theme()); } - else - { - $template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme']); - } if (empty($msg)) { |