diff options
| author | Richard Beales <[email protected]> | 2013-03-21 20:06:03 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-21 20:06:03 +0000 |
| commit | c489ae913d1778a9cdab45092bf0015e74300909 (patch) | |
| tree | 400e4934b03feb6df256ffd5e381ae46e4fffe46 /include/functions.php | |
| parent | 15c1a04d103ae4d36c68831932a27acfdee6eb5c (diff) | |
| parent | 9d9432dab87e3887e4f482ac5afff1586530c692 (diff) | |
echo upstream delete of mobile/index.php
Diffstat (limited to 'include/functions.php')
| -rw-r--r-- | include/functions.php | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/include/functions.php b/include/functions.php index 535d47674..5d5550059 100644 --- a/include/functions.php +++ b/include/functions.php @@ -75,10 +75,7 @@ $lang = _TRANSLATION_OVERRIDE_DEFAULT; } - /* In login action of mobile version */ - if ($_POST["language"] && defined('MOBILE_VERSION')) { - $lang = $_POST["language"]; - } else if ($_SESSION["language"] && $_SESSION["language"] != "auto") { + if ($_SESSION["language"] && $_SESSION["language"] != "auto") { $lang = $_SESSION["language"]; } @@ -89,11 +86,7 @@ _setlocale(LC_ALL, $lang); } - if (defined('MOBILE_VERSION')) { - _bindtextdomain("messages", "../locale"); - } else { - _bindtextdomain("messages", "locale"); - } + _bindtextdomain("messages", "locale"); _textdomain("messages"); _bind_textdomain_codeset("messages", "UTF-8"); @@ -753,7 +746,7 @@ } } - function login_sequence($link, $login_form = 0) { + function login_sequence($link) { $_SESSION["prefs_cache"] = false; if (SINGLE_USER_MODE) { @@ -769,7 +762,7 @@ authenticate_user($link, null, null, true); } - if (!$_SESSION["uid"]) render_login_form($link, $login_form); + if (!$_SESSION["uid"]) render_login_form($link); } else { /* bump login timestamp */ @@ -2816,15 +2809,8 @@ return true; } - function render_login_form($link, $form_id = 0) { - switch ($form_id) { - case 0: - require_once "login_form.php"; - break; - case 1: - require_once "mobile/login_form.php"; - break; - } + function render_login_form($link) { + require_once "login_form.php"; exit; } |