aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/functions.inc.php11
-rw-r--r--include/functions_user.inc.php2
2 files changed, 3 insertions, 10 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php
index f4422c3a2..0f26fde77 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1159,9 +1159,7 @@ function l10n_args($key_args, $sep = "\n")
*/
function get_themeconf($key)
{
- global $template;
-
- return $template->get_themeconf($key);
+ return $GLOBALS['template']->get_themeconf($key);
}
/**
@@ -1313,12 +1311,7 @@ function conf_get_param($param, $default_value=null)
{
return $conf[$param];
}
- elseif (isset($default_value))
- {
- return $default_value;
- }
-
- return null;
+ return $default_value;
}
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 87ed8bf08..65ddef1ca 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -1517,7 +1517,7 @@ SELECT
$user['id'] = $key['user_id'];
log_user($user['id'], false);
- trigger_notify('login_success', stripslashes($key['username']));
+ trigger_notify('login_success', $key['username']);
// to be registered in history table by pwg_log function
$page['auth_key_id'] = $key['auth_key_id'];