diff options
| author | Rouslan Placella <rouslan@placella.com> | 2012-05-24 00:25:48 +0400 |
|---|---|---|
| committer | Rouslan Placella <rouslan@placella.com> | 2012-06-11 17:06:02 +0400 |
| commit | 4a740376c89755698ae5fac3746eb57ba07142ae (patch) | |
| tree | b33aa2a42117a87d24f145080d3f9a8887a0e21e /user_password.php | |
| parent | 97449dae42a11cfa7f4571aaadeab3fefc30acf7 (diff) | |
Dropped header.inc.php in favor of the PMA_Header class
Diffstat (limited to 'user_password.php')
| -rw-r--r-- | user_password.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/user_password.php b/user_password.php index 8a9937eb00..d28550bb93 100644 --- a/user_password.php +++ b/user_password.php @@ -12,7 +12,9 @@ */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'server_privileges.js'; +$header = PMA_Header::getInstance(); +$scripts = $header->getScripts(); +$scripts->addFile('server_privileges.js'); /** * Displays an error message and exits if the user isn't allowed to use this @@ -22,7 +24,7 @@ if (! $cfg['ShowChgPassword']) { $cfg['ShowChgPassword'] = PMA_DBI_select_db('mysql'); } if ($cfg['Server']['auth_type'] == 'config' || ! $cfg['ShowChgPassword']) { - include_once './libraries/header.inc.php'; + $header->display(); PMA_Message::error(__('You don\'t have sufficient privileges to be here right now!'))->display(); include './libraries/footer.inc.php'; } // end if @@ -50,8 +52,7 @@ if (isset($_REQUEST['nopass'])) { * If the "change password" form hasn't been submitted or the values submitted * aren't valid -> displays the form */ -// Loads the headers -require_once './libraries/header.inc.php'; +$header->display(); // Displays an error message if required if (isset($message)) { @@ -203,7 +204,7 @@ function PMA_changePassAuthType($_url_params, $password) */ function PMA_changePassDisplayPage($message, $sql_query, $_url_params) { - include_once './libraries/header.inc.php'; + PMA_Header::getInstance()->display(); echo '<h1>' . __('Change password') . '</h1>' . "\n\n"; echo PMA_getMessage($message, $sql_query, 'success'); echo '<a href="index.php'.PMA_generate_common_url($_url_params).' target="_parent">'. "\n" |