merge -c2884 from trunk to branch 2.0.

- Replace some mysql_query by pwg_query function.
- Add home button after upgrade.php.
- Add utf8 charset for access denied message.
- Replace some #content by .content in css files.
- Fix menubar blocks borders with IE.

git-svn-id: http://piwigo.org/svn/branches/2.0@2885 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 2 insertions, 1 deletions

diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index cb530749a..07676efc5 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -588,6 +588,7 @@ function access_denied()
   set_status_header(401);
   if ( isset($user) and !is_a_guest() )
   {
+    echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
     echo '<div style="text-align:center;">'.l10n('access_forbiden').'<br />';
     echo '<a href="'.get_root_url().'identification.php">'.l10n('identification').'</a>&nbsp;';
     echo '<a href="'.make_index_url().'">'.l10n('home').'</a></div>';
diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index ed026a175..728fc8fba 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -146,7 +146,7 @@ INSERT INTO '.SESSIONS_TABLE.'
   (id,data,expiration)
   VALUES(\''.get_remote_addr_session_hash().$session_id.'\',\''.$data.'\',now())
 ;';
-  mysql_query($query);
+  pwg_query($query);
   return true;
 }