Skip to content
Snippets Groups Projects
Commit 97669638 authored by Tim Steiner's avatar Tim Steiner
Browse files

[gh-101] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@551 20a16fea-79d4-4915-8869-1ea9d5ebf173
parent 068d50bc
No related branches found
No related tags found
No related merge requests found
...@@ -78,8 +78,7 @@ function unl_cas_menu() { ...@@ -78,8 +78,7 @@ function unl_cas_menu() {
return $items; return $items;
} }
function unl_cas_menu_alter(&$items) function unl_cas_menu_alter(&$items) {
{
$items['admin/people/create']['weight'] = 2; $items['admin/people/create']['weight'] = 2;
$items['admin/people/create']['title'] .= ' manually'; $items['admin/people/create']['title'] .= ' manually';
} }
...@@ -119,7 +118,11 @@ function unl_cas_validate() { ...@@ -119,7 +118,11 @@ function unl_cas_validate() {
function unl_cas_form_alter(&$form, $form_state, $form_id) { function unl_cas_form_alter(&$form, $form_state, $form_id) {
if ($form_id == 'user_login') { if ($form_id == 'user_login') {
if (isset($_SESSION['unl_cas']['previous_path'])) { if (isset($_GET['destination'])) {
$_SESSION['unl_cas']['return_path'] = $_GET['destination'];
unset($_GET['destination']);
}
else if (isset($_SESSION['unl_cas']['previous_path'])) {
$_SESSION['unl_cas']['return_path'] = $_SESSION['unl_cas']['previous_path']; $_SESSION['unl_cas']['return_path'] = $_SESSION['unl_cas']['previous_path'];
} }
$cas = unl_cas_get_adapter(); $cas = unl_cas_get_adapter();
...@@ -162,7 +165,6 @@ function unl_cas_form_alter(&$form, $form_state, $form_id) { ...@@ -162,7 +165,6 @@ function unl_cas_form_alter(&$form, $form_state, $form_id) {
drupal_goto('https://id.unl.edu/user/userForgotPassword.jsp'); drupal_goto('https://id.unl.edu/user/userForgotPassword.jsp');
} }
} }
/** /**
...@@ -333,8 +335,7 @@ function unl_cas_set_setting($name, $value) { ...@@ -333,8 +335,7 @@ function unl_cas_set_setting($name, $value) {
} }
} }
function unl_cas_user_is_administrator() function unl_cas_user_is_administrator() {
{
$user = $GLOBALS['user']; $user = $GLOBALS['user'];
if ($user && in_array(variable_get('user_admin_role'), array_keys($user->roles))) { if ($user && in_array(variable_get('user_admin_role'), array_keys($user->roles))) {
return TRUE; return TRUE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment