aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2008-10-15 17:55:18 +0000
committerpatdenice <patdenice@piwigo.org>2008-10-15 17:55:18 +0000
commit5ce101c1939bcea8b3171d3d0cf494b35a9650f3 (patch)
tree1ee1b5fe12447f52f7d37a44193d460a1f6a99c2 /include
parentfd1badf24b962381f2600abbe9d2714f1f463005 (diff)
Merge from trunk 2747:
- Install process now looks like goto/roma. - Move install.tpl to goto template. - add charset utf8 to fatal error function. - Check php version on install and upgrade, and die if < 5. git-svn-id: http://piwigo.org/svn/branches/2.0@2748 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_html.inc.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 2b3994aa8..0a09ab31a 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -671,7 +671,8 @@ function fatal_error($msg)
$msg .= "\n";
}
- $display = "<h1>Piwigo encountered a non recoverable error</h1>
+ $display = "<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
+<h1>Piwigo encountered a non recoverable error</h1>
<pre style='font-size:larger;background:white;color:red;padding:1em;margin:0;clear:both;display:block;width:auto;height:auto;overflow:auto'>
<b>$msg</b>
$btrace_msg