Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

# Fixed artf2793 : New user confirmation link warning on login

git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@1717 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
  • Loading branch information...
commit 62011a91c374db0ca17834c7df29bedda92b8ed7 1 parent 43750e5
@reygigataras reygigataras authored
Showing with 8 additions and 4 deletions.
  1. +8 −4 index.php
View
12 index.php
@@ -55,20 +55,24 @@
mosErrorAlert( JText::_( 'LOGIN_INCORRECT' ) );
}
- if ($return) {
+ if ( $return && !( strpos( $return, 'com_registration' ) || strpos( $return, 'com_login' ) ) ) {
+ // checks for the presence of a return url
+ // and ensures that this url is not the registration or login pages
mosRedirect( $return );
} else {
- mosRedirect( 'index.php' );
+ mosRedirect( $mosConfig_live_site );
}
}
if ($option == 'logout') {
$mainframe->logout();
- if ($return) {
+ if ( $return && !( strpos( $return, 'com_registration' ) || strpos( $return, 'com_login' ) ) ) {
+ // checks for the presence of a return url
+ // and ensures that this url is not the registration or logout pages
mosRedirect( $return );
} else {
- mosRedirect( 'index.php' );
+ mosRedirect( $mosConfig_live_site );
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.