diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-10-03 15:24:04 -0400 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-10-03 15:24:04 -0400 |
commit | b0aabd0559eb6ca70af2ffeb35299b63d7edf097 (patch) | |
tree | f6b31f7478c540ecb056bc22508fb1450e2735c7 /index.php | |
parent | dc0fb9445e8a3ede8bc33d6779fadd89b7ea6893 (diff) | |
download | fourisland-b0aabd0559eb6ca70af2ffeb35299b63d7edf097.tar.gz fourisland-b0aabd0559eb6ca70af2ffeb35299b63d7edf097.tar.bz2 fourisland-b0aabd0559eb6ca70af2ffeb35299b63d7edf097.zip |
Fixed voting issue
Because XHTML was accidentally disabled in the previous changeset, a new error was found that, when in HTML mode (required for IE and layouts prior to 7), voting did not work due to the encoded ampherstand in the query string. This is odd because what works in XHTML should also work in HTML. So, to fix this, XHTML was re-enabled and now the ampherstand is only encoded when XHTML mode is on. Also fixed some positioning errors with the tails of bubbles.
Diffstat (limited to 'index.php')
-rwxr-xr-x | index.php | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/index.php b/index.php index d110743..7a958ee 100755 --- a/index.php +++ b/index.php | |||
@@ -20,14 +20,6 @@ | |||
20 | 20 | ||
21 | require('headerproc.php'); | 21 | require('headerproc.php'); |
22 | 22 | ||
23 | if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched)) | ||
24 | { | ||
25 | header('Content-type: text/html'); | ||
26 | $usingIE = true; | ||
27 | } else { | ||
28 | // header('Content-type: application/xhtml+xml'); | ||
29 | } | ||
30 | |||
31 | header('X-Pingback: http://fourisland.com/xmlrpc.php'); | 23 | header('X-Pingback: http://fourisland.com/xmlrpc.php'); |
32 | 24 | ||
33 | include('../security/config.php'); | 25 | include('../security/config.php'); |
@@ -42,6 +34,32 @@ include('includes/functions.php'); | |||
42 | include('includes/hits.php'); | 34 | include('includes/hits.php'); |
43 | include('includes/updatePending.php'); | 35 | include('includes/updatePending.php'); |
44 | 36 | ||
37 | if (isset($_GET['layout'])) | ||
38 | { | ||
39 | if (!file_exists('theme/layouts/' . basename($_GET['layout']))) | ||
40 | { | ||
41 | $_GET['layout'] = '7'; | ||
42 | } | ||
43 | |||
44 | setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com'); | ||
45 | |||
46 | unset($_GET['layout']); | ||
47 | |||
48 | header('Location: ' . getRewriteURL()); | ||
49 | exit; | ||
50 | } | ||
51 | |||
52 | if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched)) | ||
53 | { | ||
54 | $usingIE = true; | ||
55 | } else { | ||
56 | if (getLayout() == '7') | ||
57 | { | ||
58 | header('Content-type: application/xhtml+xml'); | ||
59 | $xhtml = true; | ||
60 | } | ||
61 | } | ||
62 | |||
45 | if (strpos($_SERVER['REQUEST_URI'],'index.php')) | 63 | if (strpos($_SERVER['REQUEST_URI'],'index.php')) |
46 | { | 64 | { |
47 | header('Location: ' . getRewriteURL()); | 65 | header('Location: ' . getRewriteURL()); |