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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-09-06 18:40:06 +02:00
commit 02d7a2c3ba
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
db_create.php
View File

@ -14,7 +14,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
require_once './libraries/mysql_charsets.lib.php';
if (!PMA_DRIZZLE) {
require './libraries/replication.inc.php';
include './libraries/replication.inc.php';
}
require './libraries/build_html_for_db.lib.php';
@ -54,8 +54,8 @@ if (! $result) {
PMA_ajaxResponse($message, false);
}
require_once './libraries/header.inc.php';
require_once './main.php';
include_once './libraries/header.inc.php';
include_once './main.php';
} else {
$message = PMA_Message::success(__('Database %1$s has been created.'));
$message->addParam($new_db);
@ -125,7 +125,7 @@ if (! $result) {
PMA_ajaxResponse($message, true, $extra_data);
}
require_once './libraries/header.inc.php';
require_once './' . $cfg['DefaultTabDatabase'];
include_once './libraries/header.inc.php';
include_once './' . $cfg['DefaultTabDatabase'];
}
?>

4
db_datadict.php
View File

@ -11,8 +11,8 @@
require_once './libraries/common.inc.php';
if (! isset($selected_tbl)) {
require './libraries/db_common.inc.php';
require './libraries/db_info.inc.php';
include './libraries/db_common.inc.php';
include './libraries/db_info.inc.php';
}

2
db_export.php
View File

@ -28,7 +28,7 @@ $export_page_title = __('View dump (schema) of database');
// exit if no tables in db found
if ($num_tables < 1) {
PMA_Message::error(__('No tables found in database.'))->display();
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
exit;
} // end if

10
db_operations.php
View File

@ -109,7 +109,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
$views = array();
// remove all foreign key constraints, otherwise we can get errors
require_once './libraries/export/sql.php';
include_once './libraries/export/sql.php';
foreach ($tables_full as $each_table => $tmp) {
$sql_constraints = '';
$sql_drop_foreign_keys = '';
@ -263,7 +263,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
/**
* cleanup pmadb stuff for this db
*/
require_once './libraries/relation_cleanup.lib.php';
include_once './libraries/relation_cleanup.lib.php';
PMA_relationsCleanupDatabase($db);
// if someday the RENAME DATABASE reappears, do not DROP
@ -329,12 +329,12 @@ if (isset($_REQUEST['comment'])) {
* because there is no table in the database ($is_info is true)
*/
if (empty($is_info)) {
require './libraries/db_common.inc.php';
include './libraries/db_common.inc.php';
$url_query .= '&amp;goto=db_operations.php';
// Gets the database structure
$sub_part = '_structure';
require './libraries/db_info.inc.php';
include './libraries/db_info.inc.php';
echo "\n";
if (isset($message)) {
@ -372,7 +372,7 @@ if (!$is_information_schema) {
}
?>
<div class="operations_half_width">
<?php require './libraries/display_create_table.lib.php'; ?>
<?php include './libraries/display_create_table.lib.php'; ?>
</div>
<?php
/**

4
db_qbe.php
View File

@ -26,7 +26,7 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
$message_to_display = true;
} else {
$goto = 'db_sql.php';
require './sql.php';
include './sql.php';
exit;
}
}
@ -99,7 +99,7 @@ $tbl_result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';',
$tbl_result_cnt = PMA_DBI_num_rows($tbl_result);
if (0 == $tbl_result_cnt) {
PMA_Message::error(__('No tables found in database.'))->display();
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
exit;
}

4
db_routines.php
View File

@ -13,9 +13,9 @@ require_once './libraries/common.inc.php';
require_once './libraries/common.lib.php';
require_once './libraries/mysql_charsets.lib.php';
if (PMA_DRIZZLE) {
require_once './libraries/data_drizzle.inc.php';
include_once './libraries/data_drizzle.inc.php';
} else {
require_once './libraries/data_mysql.inc.php';
include_once './libraries/data_mysql.inc.php';
}
/**

2
db_search.php
View File

@ -93,7 +93,7 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) {
$sub_part = '';
if ( $GLOBALS['is_ajax_request'] != true) {
require './libraries/db_info.inc.php';
include './libraries/db_info.inc.php';
echo '<div id="searchresults">';
}

2
db_sql.php
View File

@ -35,7 +35,7 @@ require './libraries/db_info.inc.php';
if ($num_tables == 0 && empty($db_query_force)) {
$sub_part = '';
$is_info = true;
require './db_structure.php';
include './db_structure.php';
exit();
}

14
db_structure.php
View File

@ -31,21 +31,21 @@ if (empty($is_info)) {
// -> db_structure.php and if we got an error on the multi submit,
// we must display it here and not call again mult_submits.inc.php
if (! isset($error) || false === $error) {
require './libraries/mult_submits.inc.php';
include './libraries/mult_submits.inc.php';
}
if (empty($message)) {
$message = PMA_Message::success();
}
}
require './libraries/db_common.inc.php';
include './libraries/db_common.inc.php';
$url_query .= '&amp;goto=db_structure.php';
// Gets the database structure
$sub_part = '_structure';
require './libraries/db_info.inc.php';
include './libraries/db_info.inc.php';
if (!PMA_DRIZZLE) {
require './libraries/replication.inc.php';
include './libraries/replication.inc.php';
} else {
$server_slave_status = false;
}
@ -66,13 +66,13 @@ if ($num_tables == 0) {
echo '<p>' . __('No tables found in database') . '</p>' . "\n";
if (empty($db_is_information_schema)) {
require './libraries/display_create_table.lib.php';
include './libraries/display_create_table.lib.php';
} // end if (Create Table dialog)
/**
* Displays the footer
*/
require_once './libraries/footer.inc.php';
include_once './libraries/footer.inc.php';
exit;
}
@ -572,7 +572,7 @@ echo __('Data Dictionary') . '</a>';
echo '</p>';
if (empty($db_is_information_schema)) {
require './libraries/display_create_table.lib.php';
include './libraries/display_create_table.lib.php';
} // end if (Create Table dialog)
/**

6
db_tracking.php
View File

@ -17,7 +17,7 @@ $GLOBALS['js_include'][] = 'db_structure.js';
* If we are not in an Ajax request, then do the common work and show the links etc.
*/
if ($GLOBALS['is_ajax_request'] != true) {
require './libraries/db_common.inc.php';
include './libraries/db_common.inc.php';
}
$url_query .= '&amp;goto=tbl_tracking.php&amp;back=db_tracking.php';
@ -48,11 +48,11 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) {
echo '<p>' . __('No tables found in database.') . '</p>' . "\n";
if (empty($db_is_information_schema)) {
require './libraries/display_create_table.lib.php';
include './libraries/display_create_table.lib.php';
}
// Display the footer
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
exit;
}