maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- utf-8 convert was not meant to make it into 0.9.x, fixes #9

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-02-13 19:48:16 +00:00
parent 78ae0e2f56
commit 432f555e37
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/classes/database/class.db.php
View File

@@ -134,8 +134,11 @@ class db
$this->showerror('Trying to use database ' . $this->database . ' failed, exiting'); $this->showerror('Trying to use database ' . $this->database . ' failed, exiting');
} }
} }
mysql_query("SET NAMES utf8", $this->link_id); /*
mysql_query("SET CHARACTER SET utf8", $this->link_id); * this is not for 0.9.x
*/
//mysql_query("SET NAMES utf8", $this->link_id);
//mysql_query("SET CHARACTER SET utf8", $this->link_id);
} }
/** /**

2
lib/init.php
View File

@@ -21,7 +21,7 @@
header("Cache-Control: no-cache, must-revalidate"); header("Cache-Control: no-cache, must-revalidate");
header("Pragma: no-cache"); header("Pragma: no-cache");
header("Content-type: text/html; charset=utf-8"); header("Content-type: text/html; charset=iso-8859-1");
// ensure that default timezone is set // ensure that default timezone is set
if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get")) if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))

2
templates/header.tpl
View File

@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<if $settings['panel']['no_robots'] == '0'> <if $settings['panel']['no_robots'] == '0'>
<meta name="robots" content="noindex, nofollow, noarchive" /> <meta name="robots" content="noindex, nofollow, noarchive" />
<meta name="GOOGLEBOT" content="nosnippet" /> <meta name="GOOGLEBOT" content="nosnippet" />