nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts for upstream merge

Browse Source
This commit is contained in:
ninadsp
2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
user_password.php
View File

@@ -47,7 +47,7 @@ if (!$cfg['ShowChgPassword']) {
if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) {
require_once './libraries/header.inc.php';
PMA_Message::error(__('You don\'t have sufficient privileges to be here right now!'))->display();
require_once './libraries/footer.inc.php';
require './libraries/footer.inc.php';
} // end if
@@ -109,7 +109,7 @@ if (isset($_REQUEST['nopass'])) {
<a href="index.php<?php echo PMA_generate_common_url($_url_params); ?>" target="_parent">
<strong><?php echo __('Back'); ?></strong></a>
<?php
require_once './libraries/footer.inc.php';
require './libraries/footer.inc.php';
} // end if
} // end if
@@ -133,5 +133,5 @@ require_once './libraries/display_change_password.lib.php';
/**
* Displays the footer
*/
require_once './libraries/footer.inc.php';
require './libraries/footer.inc.php';
?>