- 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/trunk@2884 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 7 insertions, 3 deletions

diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index c80a01848..65b0a21ed 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -124,10 +124,10 @@ UPDATE '.PREFIX_TABLE.'plugins
 SET state="inactive"
 WHERE id IN ("' . implode('","', $plugins) . '")
 ;';
-    mysql_query($query);
+    pwg_query($query);
 
     array_push($page['infos'],
-      l10n('deactivated plugins').'<br /><br /><i>'.implode(', ', $plugins).'</i><br />');
+      l10n('deactivated plugins').'<p><i>'.implode(', ', $plugins).'</i></p>');
   }
 }
 
@@ -159,7 +159,7 @@ ON u.'.$conf['user_fields']['id'].'=ui.user_id
 WHERE '.$conf['user_fields']['username'].'="'.$username.'"
 ;';
   }
-  $row = mysql_fetch_assoc(mysql_query($query));
+  $row = mysql_fetch_assoc(pwg_query($query));
 
   if (!isset($conf['pass_convert']))
   {
diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl
index 6e2e0730b..c217b738c 100644
--- a/admin/template/goto/upgrade.tpl
+++ b/admin/template/goto/upgrade.tpl
@@ -104,6 +104,10 @@ textarea { margin-left: 20px; }
   <li>{$info}</li>
   {/foreach}
 </ul>
+
+<form action="index.php" method="post">
+<p><input type="submit" name="submit" value="{'home'|@translate}"/></p>
+</form>
 {/if}
 
 </div> {* content *}