Bugfixes (#5949)
* Added missing parameter to send_email() * Preserving the call-center queue_record_template value when saving * Removed unused declarations using the commented-out $last_offered_call * Fix for redirecting to previous page after login, if set * Removed duplicate bugfix in /resources/login.php
This commit is contained in:
+6
-1
@@ -152,7 +152,7 @@
|
||||
$email_body = str_replace('${domain}', $domain_name, $email_body);
|
||||
|
||||
//send reset link
|
||||
if (send_email($email, $email_subject, $email_body)) {
|
||||
if (send_email($email, $email_subject, $email_body, $eml_error)) {
|
||||
//email sent
|
||||
message::add($text['message-reset_link_sent'], 'positive', 2500);
|
||||
}
|
||||
@@ -242,6 +242,11 @@
|
||||
//set variable if not set
|
||||
if (!isset($_SESSION['login']['domain_name_visible']['boolean'])) { $_SESSION['login']['domain_name_visible']['boolean'] = null; }
|
||||
|
||||
//set the requested destination after login
|
||||
if (!empty($_REQUEST['path'])) {
|
||||
$_SESSION['login']['destination']['url'] = $_REQUEST['path'];
|
||||
}
|
||||
|
||||
//set a default login destination
|
||||
if (strlen($_SESSION['login']['destination']['url']) == 0) {
|
||||
$_SESSION['login']['destination']['url'] = PROJECT_PATH."/core/user_settings/user_dashboard.php";
|
||||
|
||||
Reference in New Issue
Block a user