diff options
| author | patdenice <patdenice@piwigo.org> | 2008-11-19 15:46:49 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2008-11-19 15:46:49 +0000 |
| commit | 70e5f51d005002372b1c694e1c31684f4a64eeae (patch) | |
| tree | aabda5a7d49bb2f630a40efa3e4059e28031c45e /admin/include | |
| parent | e037bbe726d8819de81ee99e28e0e18aaddc38ca (diff) | |
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
Diffstat (limited to 'admin/include')
| -rw-r--r-- | admin/include/functions_upgrade.php | 6 |
1 files changed, 3 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'])) { |