summary refs log tree commit diff stats
path: root/pages
diff options
context:
space:
mode:
authorStarla Insigna <hatkirby@fourisland.com>2009-10-03 15:24:04 -0400
committerStarla Insigna <hatkirby@fourisland.com>2009-10-03 15:24:04 -0400
commitb0aabd0559eb6ca70af2ffeb35299b63d7edf097 (patch)
treef6b31f7478c540ecb056bc22508fb1450e2735c7 /pages
parentdc0fb9445e8a3ede8bc33d6779fadd89b7ea6893 (diff)
downloadfourisland-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 'pages')
-rwxr-xr-xpages/blog.php3
-rwxr-xr-xpages/quotes.php4
-rwxr-xr-xpages/welcome.php3
3 files changed, 10 insertions, 0 deletions
diff --git a/pages/blog.php b/pages/blog.php index 6703c12..28fa759 100755 --- a/pages/blog.php +++ b/pages/blog.php
@@ -29,6 +29,9 @@ if (isset($_GET['post']))
29{ 29{
30 $template = new FITemplate('post'); 30 $template = new FITemplate('post');
31 $template->adds_block('INTERNAL',array('exi'=>1)); 31 $template->adds_block('INTERNAL',array('exi'=>1));
32 $template->add('IFXAMP', $xhtml ? '&amp;' : '&');
33 $template->add('IFXLT', $xhtml ? '&lt;' : '<');
34 $template->add('IFXGT', $xhtml ? '&gt;' : '>');
32 35
33 $getpost = "SELECT * FROM updates WHERE slug = \"" . urldecode($_GET['post']) . "\""; 36 $getpost = "SELECT * FROM updates WHERE slug = \"" . urldecode($_GET['post']) . "\"";
34 $getpost2 = mysql_query($getpost); 37 $getpost2 = mysql_query($getpost);
diff --git a/pages/quotes.php b/pages/quotes.php index f1e0d65..8c6958d 100755 --- a/pages/quotes.php +++ b/pages/quotes.php
@@ -187,7 +187,11 @@ if (isset($_GET['id']) && !(is_numeric($_GET['id'])))
187 187
188function quote_generation($query, $origin, $page = 1, $quote_limit = 50, $page_limit = 10) 188function quote_generation($query, $origin, $page = 1, $quote_limit = 50, $page_limit = 10)
189{ 189{
190 global $xhtml;
191
190 $template = new FITemplate('quotes/browse'); 192 $template = new FITemplate('quotes/browse');
193 $template->add('IFXAMP', $xhtml ? '&amp;' : '&');
194
191 if ($page != -1) 195 if ($page != -1)
192 { 196 {
193 $template->adds_block('PAGENUMBERS',array('exi'=>1)); 197 $template->adds_block('PAGENUMBERS',array('exi'=>1));
diff --git a/pages/welcome.php b/pages/welcome.php index 5bd710c..833af8a 100755 --- a/pages/welcome.php +++ b/pages/welcome.php
@@ -31,6 +31,9 @@ $hatNav = array( array( 'title' => 'Archive',
31 31
32$template = new FITemplate('post'); 32$template = new FITemplate('post');
33$template->adds_block('EXTERNAL',array('exi'=>1)); 33$template->adds_block('EXTERNAL',array('exi'=>1));
34$template->add('IFXAMP', $xhtml ? '&amp;' : '&');
35$template->add('IFXLT', $xhtml ? '&lt;' : '<');
36$template->add('IFXGT', $xhtml ? '&gt;' : '>');
34 37
35$curID = 0; 38$curID = 0;
36 39