Peter M. Groen / knowledgetree

Commit 3a1bfc78db443dd10ca402bde87896400f92ad2e

Authored by kevin_fourie
1 parent f72fcb2d

Merged in from DEV trunk... 

KTS-3420"Remove redirect via control on login"?Fixed. Removed the redirect.??Committed by: Megan Watson?Reviewed by: Conrad Vermeulen?

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/branches/3.5.3-Branch@8590 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 10 additions and 10 deletions
login.php
  View file @3a1bfc7
@@ -9,31 +9,31 @@ @@ -9,31 +9,31 @@
9 * Document Management Made Simple 9 * Document Management Made Simple
10 * Copyright (C) 2008 KnowledgeTree Inc. 10 * Copyright (C) 2008 KnowledgeTree Inc.
11 * Portions copyright The Jam Warehouse Software (Pty) Limited 11 * Portions copyright The Jam Warehouse Software (Pty) Limited
12 - * 12 + *
13 * This program is free software; you can redistribute it and/or modify it under 13 * This program is free software; you can redistribute it and/or modify it under
14 * the terms of the GNU General Public License version 3 as published by the 14 * the terms of the GNU General Public License version 3 as published by the
15 * Free Software Foundation. 15 * Free Software Foundation.
16 - * 16 + *
17 * This program is distributed in the hope that it will be useful, but WITHOUT 17 * This program is distributed in the hope that it will be useful, but WITHOUT
18 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 18 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
19 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 19 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
20 * details. 20 * details.
21 - * 21 + *
22 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
23 * along with this program. If not, see <http://www.gnu.org/licenses/>. 23 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 - *  
25 - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 24 + *
  25 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
26 * California 94120-7775, or email info@knowledgetree.com. 26 * California 94120-7775, or email info@knowledgetree.com.
27 - * 27 + *
28 * The interactive user interfaces in modified source and object code versions 28 * The interactive user interfaces in modified source and object code versions
29 * of this program must display Appropriate Legal Notices, as required under 29 * of this program must display Appropriate Legal Notices, as required under
30 * Section 5 of the GNU General Public License version 3. 30 * Section 5 of the GNU General Public License version 3.
31 - * 31 + *
32 * In accordance with Section 7(b) of the GNU General Public License version 3, 32 * In accordance with Section 7(b) of the GNU General Public License version 3,
33 * these Appropriate Legal Notices must retain the display of the "Powered by 33 * these Appropriate Legal Notices must retain the display of the "Powered by
34 - * KnowledgeTree" logo and retain the original copyright notice. If the display of the 34 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
35 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices 35 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
36 - * must display the words "Powered by KnowledgeTree" and retain the original 36 + * must display the words "Powered by KnowledgeTree" and retain the original
37 * copyright notice. 37 * copyright notice.
38 * Contributor( s): ______________________________________ 38 * Contributor( s): ______________________________________
39 */ 39 */
@@ -342,7 +342,7 @@ class LoginPageDispatcher extends KTDispatcher { @@ -342,7 +342,7 @@ class LoginPageDispatcher extends KTDispatcher {
342 $url = $redirect; 342 $url = $redirect;
343 // else redirect to the dashboard if there is none 343 // else redirect to the dashboard if there is none
344 } else { 344 } else {
345 - $url = generateControllerUrl("dashboard"); 345 + $url = KTUtil::kt_url().'/dashboard.php';
346 } 346 }
347 347
348 exit(redirect($url)); 348 exit(redirect($url));