From 195e70bbbcfc581ceb9b7555dc5fbb5c6c5b92ba Mon Sep 17 00:00:00 2001 From: "martijn.niji@gmail.com" Date: Sat, 4 Apr 2009 21:57:09 +0000 Subject: [PATCH] Reverting last two commits --- changelog.txt | 4 +--- frog/app/controllers/LoginController.php | 2 -- index.php | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/changelog.txt b/changelog.txt index b6327cb..3644f20 100644 --- a/changelog.txt +++ b/changelog.txt @@ -24,8 +24,6 @@ Sigla: + Removed split between frontend and backend. + Added an ID to the "view this page" link so it can be styled. + Added Danish translation for admin and file manager. Thanks Kenan. -- Fixed USE_MOD_REWRITE is undefined in case of system not yet being installed - issue 132 -- Fixed issue with failed login redirecting to admin section once logged in. - issue 131 - Fixed issue with settings table. Changed table setting's field value to TEXT instead of VARCHAR. - Fixed GET variables not being available in Frog's frontend. - issue 75 - Fixed issue where AutoLoader did not find file for 'PageArchiveMonthIndex' - issue 101 @@ -256,4 +254,4 @@ Sigla: bug fix: filter in snippet is now like in parts 0.1.1 - first public version with 1 week of dev... mega alpha beta version. \ No newline at end of file + first public version with 1 week of dev... mega alpha beta version. diff --git a/frog/app/controllers/LoginController.php b/frog/app/controllers/LoginController.php index 08b0625..b3062d3 100644 --- a/frog/app/controllers/LoginController.php +++ b/frog/app/controllers/LoginController.php @@ -99,8 +99,6 @@ function login() } else { Flash::set('error', __('Login failed. Please check your login data and try again.')); - if ($data['redirect'] != null && $data['redirect'] != 'null') - redirect($data['redirect']); Observer::notify('admin_login_failed', $data['username']); } } diff --git a/index.php b/index.php index 92920e3..e9d7294 100644 --- a/index.php +++ b/index.php @@ -29,11 +29,11 @@ require FROG_ROOT.'/config.php'; +define('BASE_URL', URL_PUBLIC . (USE_MOD_REWRITE ? '': '?')); + // if you have installed frog and see this line, you can comment it or delete it :) if ( ! defined('DEBUG')) { header('Location: install/'); exit(); } -define('BASE_URL', URL_PUBLIC . (USE_MOD_REWRITE ? '': '?')); - require CORE_ROOT.'/Framework.php'; if (USE_PDO)