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

Rename variable to match current meaning

Browse Source 
There is not only INFORMATION_SCHEMA now, so the variable should have
more generic name.

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2014-01-06 11:11:34 +01:00
parent c2c3da1c31
commit 790a2c2bee
11 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_operations.php
View File

@ -237,7 +237,7 @@ if (!$is_information_schema) {
// You won't be able to. Believe me. You won't.
// Don't allow to easily drop mysql database, RFE #1327514.
if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase'])
&& ! $db_is_information_schema
&& ! $db_is_system_schema
&& (PMA_DRIZZLE || $db != 'mysql')
) {
$response->addHTML(PMA_getHtmlForDropDatabaseLink($db));

18
db_structure.php
View File

@ -67,7 +67,7 @@ if ($num_tables == 0) {
$response->addHTML(
'<p>' . __('No tables found in database.') . '</p>' . "\n"
);
if (empty($db_is_information_schema)) {
if (empty($db_is_system_schema)) {
ob_start();
include 'libraries/display_create_table.lib.php';
$content = ob_get_contents();
@ -114,7 +114,7 @@ $response->addHTML(
$response->addHTML(PMA_URL_getHiddenInputs($db));
$response->addHTML(
PMA_tableHeader($db_is_information_schema, $server_slave_status)
PMA_tableHeader($db_is_system_schema, $server_slave_status)
);
$i = $sum_entries = 0;
@ -149,7 +149,7 @@ foreach ($tables as $keyname => $current_table) {
list($current_table, $formatted_size, $unit, $formatted_overhead,
$overhead_unit, $overhead_size, $table_is_view, $sum_size)
= PMA_getStuffForEngineTypeTable(
$current_table, $db_is_information_schema,
$current_table, $db_is_system_schema,
$is_show_stats, $table_is_view, $sum_size, $overhead_size
);
@ -226,10 +226,10 @@ foreach ($tables as $keyname => $current_table) {
list($browse_table, $search_table, $browse_table_label, $empty_table,
$tracking_icon) = PMA_getHtmlForActionLinks(
$current_table, $table_is_view, $tbl_url_query,
$titles, $truename, $db_is_information_schema, $url_query
$titles, $truename, $db_is_system_schema, $url_query
);
if (! $db_is_information_schema) {
if (! $db_is_system_schema) {
list($drop_query, $drop_message)
= PMA_getTableDropQueryAndMessage($table_is_view, $current_table);
}
@ -255,7 +255,7 @@ foreach ($tables as $keyname => $current_table) {
list($html_output, $odd_row) = PMA_getHtmlForStructureTableRow(
$i, $odd_row, $table_is_view, $current_table,
$browse_table_label, $tracking_icon, $server_slave_status,
$browse_table, $tbl_url_query, $search_table, $db_is_information_schema,
$browse_table, $tbl_url_query, $search_table, $db_is_system_schema,
$titles, $empty_table, $drop_query, $drop_message, $collation,
$formatted_size, $unit, $overhead,
(isset ($create_time) ? $create_time : ''),
@ -271,7 +271,7 @@ foreach ($tables as $keyname => $current_table) {
$response->addHTML('</tbody>');
$response->addHTML(
PMA_getHtmlBodyForTableSummary(
$num_tables, $server_slave_status, $db_is_information_schema, $sum_entries,
$num_tables, $server_slave_status, $db_is_system_schema, $sum_entries,
$db_collation, $is_show_stats, $sum_size, $overhead_size, $create_time_all,
$update_time_all, $check_time_all, $sum_row_count_pre
)
@ -281,7 +281,7 @@ $response->addHTML('</table>');
$response->addHTML(
PMA_getHtmlForCheckAllTables(
$pmaThemeImage, $text_dir, $overhead_check,
$db_is_information_schema, $hidden_fields
$db_is_system_schema, $hidden_fields
)
);
$response->addHTML('</form>'); //end of form
@ -306,7 +306,7 @@ $response->addHTML(
. PMA_getHtmlForDataDictionaryLink($url_query)
);
if (empty($db_is_information_schema)) {
if (empty($db_is_system_schema)) {
ob_start();
include 'libraries/display_create_table.lib.php';
$content = ob_get_contents();

2
db_tracking.php
View File

@ -50,7 +50,7 @@ $data = PMA_Tracker::getTrackedData($_REQUEST['db'], '', '1');
if ($num_tables == 0 && count($data['ddlog']) == 0) {
echo '<p>' . __('No tables found in database.') . '</p>' . "\n";
if (empty($db_is_information_schema)) {
if (empty($db_is_system_schema)) {
include 'libraries/display_create_table.lib.php';
}
exit;

20
libraries/Menu.class.php
View File

@ -285,7 +285,7 @@ class PMA_Menu
*/
private function _getTableTabs()
{
$db_is_information_schema = $GLOBALS['dbi']->isSystemSchema($this->_db);
$db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($this->_db);
$tbl_is_view = PMA_Table::isView($this->_db, $this->_table);
$is_superuser = $GLOBALS['dbi']->isSuperuser();
@ -312,7 +312,7 @@ class PMA_Menu
array('tbl_select.php', 'tbl_zoom_select.php', 'tbl_find_replace.php')
);
if (! $db_is_information_schema) {
if (! $db_is_system_schema) {
$tabs['insert']['icon'] = 'b_insrow.png';
$tabs['insert']['link'] = 'tbl_change.php';
$tabs['insert']['text'] = __('Insert');
@ -326,12 +326,12 @@ class PMA_Menu
/**
* Don't display "Import" for views and information_schema
*/
if (! $tbl_is_view && ! $db_is_information_schema) {
if (! $tbl_is_view && ! $db_is_system_schema) {
$tabs['import']['icon'] = 'b_tblimport.png';
$tabs['import']['link'] = 'tbl_import.php';
$tabs['import']['text'] = __('Import');
}
if ($is_superuser && ! PMA_DRIZZLE && ! $db_is_information_schema) {
if ($is_superuser && ! PMA_DRIZZLE && ! $db_is_system_schema) {
$tabs['privileges']['link'] = 'server_privileges.php';
$tabs['privileges']['args']['checkprivsdb'] = $this->_db;
$tabs['privileges']['args']['checkprivstable'] = $this->_table;
@ -343,7 +343,7 @@ class PMA_Menu
/**
* Don't display "Operations" for views and information_schema
*/
if (! $tbl_is_view && ! $db_is_information_schema) {
if (! $tbl_is_view && ! $db_is_system_schema) {
$tabs['operation']['icon'] = 'b_tblops.png';
$tabs['operation']['link'] = 'tbl_operations.php';
$tabs['operation']['text'] = __('Operations');
@ -353,7 +353,7 @@ class PMA_Menu
$tabs['tracking']['text'] = __('Tracking');
$tabs['tracking']['link'] = 'tbl_tracking.php';
}
if (! $db_is_information_schema
if (! $db_is_system_schema
&& ! PMA_DRIZZLE
&& PMA_Util::currentUserHasPrivilege(
'TRIGGER',
@ -370,7 +370,7 @@ class PMA_Menu
/**
* Views support a limited number of operations
*/
if ($tbl_is_view && ! $db_is_information_schema) {
if ($tbl_is_view && ! $db_is_system_schema) {
$tabs['operation']['icon'] = 'b_tblops.png';
$tabs['operation']['link'] = 'view_operations.php';
$tabs['operation']['text'] = __('Operations');
@ -386,7 +386,7 @@ class PMA_Menu
*/
private function _getDbTabs()
{
$db_is_information_schema = $GLOBALS['dbi']->isSystemSchema($this->_db);
$db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($this->_db);
$num_tables = count($GLOBALS['dbi']->getTables($this->_db));
$is_superuser = $GLOBALS['dbi']->isSuperuser();
@ -426,7 +426,7 @@ class PMA_Menu
$tabs['export']['warning'] = __('Database seems to be empty!');
}
if (! $db_is_information_schema) {
if (! $db_is_system_schema) {
$tabs['import']['link'] = 'db_import.php';
$tabs['import']['text'] = __('Import');
$tabs['import']['icon'] = 'b_import.png';
@ -471,7 +471,7 @@ class PMA_Menu
$tabs['tracking']['link'] = 'db_tracking.php';
}
if (! $db_is_information_schema && $cfgRelation['designerwork']) {
if (! $db_is_system_schema && $cfgRelation['designerwork']) {
$tabs['designer']['text'] = __('Designer');
$tabs['designer']['icon'] = 'b_relations.png';
$tabs['designer']['link'] = 'pmd_general.php';

4
libraries/db_common.inc.php
View File

@ -18,8 +18,8 @@ PMA_Util::checkParameters(array('db'));
$is_show_stats = $cfg['ShowStats'];
$db_is_information_schema = $GLOBALS['dbi']->isSystemSchema($db);
if ($db_is_information_schema) {
$db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
if ($db_is_system_schema) {
$is_show_stats = false;
}

6
libraries/db_info.inc.php
View File

@ -5,7 +5,7 @@
* tables if possible
*
* fills tooltip arrays and provides $tables, $num_tables, $is_show_stats
* and $db_is_information_schema
* and $db_is_system_schema
*
* speedup view on locked tables
*
@ -39,11 +39,11 @@ $is_show_stats = $cfg['ShowStats'];
/**
* @global bool whether selected db is information_schema
*/
$db_is_information_schema = false;
$db_is_system_schema = false;
if ($GLOBALS['dbi']->isSystemSchema($db)) {
$is_show_stats = false;
$db_is_information_schema = true;
$db_is_system_schema = true;
}
/**

20
libraries/display_structure.inc.php
View File

@ -34,7 +34,7 @@ $response->addHTML($html_form);
$response->addHTML(PMA_URL_getHiddenInputs($db, $table));
$tabletype = '<input type="hidden" name="table_type" value=';
if ($db_is_information_schema) {
if ($db_is_system_schema) {
$tabletype .= '"information_schema" />';
} else if ($tbl_is_view) {
$tabletype .= '"view" />';
@ -49,7 +49,7 @@ $response->addHTML($tablestructure);
$response->addHTML(
PMA_getHtmlForTableStructureHeader(
$db_is_information_schema,
$db_is_system_schema,
$tbl_is_view
)
);
@ -173,11 +173,11 @@ foreach ($fields as $row) {
$row, $rownum, $displayed_field_name,
$type_nowrap, $extracted_columnspec, $type_mime,
$field_charset, $attribute, $tbl_is_view,
$db_is_information_schema, $url_query, $field_encoded, $titles, $table
$db_is_system_schema, $url_query, $field_encoded, $titles, $table
)
);
if (! $tbl_is_view && ! $db_is_information_schema) {
if (! $tbl_is_view && ! $db_is_system_schema) {
$response->addHTML(
PMA_getHtmlForActionsInTableStructure(
$type, $tbl_storage_engine, $primary,
@ -185,7 +185,7 @@ foreach ($fields as $row) {
$hidden_titles, $columns_with_unique_index
)
);
} // end if (! $tbl_is_view && ! $db_is_information_schema)
} // end if (! $tbl_is_view && ! $db_is_system_schema)
$response->addHTML('</tr>');
@ -197,7 +197,7 @@ $response->addHTML('</tbody></table>');
$response->addHTML(
PMA_getHtmlForCheckAllTableColumn(
$pmaThemeImage, $text_dir, $tbl_is_view,
$db_is_information_schema, $tbl_storage_engine
$db_is_system_schema, $tbl_storage_engine
)
);
@ -217,12 +217,12 @@ if ($tbl_is_view) {
}
$response->addHTML(
PMA_getHtmlForOptionalActionLinks(
$url_query, $tbl_is_view, $db_is_information_schema,
$url_query, $tbl_is_view, $db_is_system_schema,
$tbl_storage_engine, $cfgRelation
)
);
if (! $tbl_is_view && ! $db_is_information_schema) {
if (! $tbl_is_view && ! $db_is_system_schema) {
$response->addHTML('<br />');
$response->addHTML(PMA_getHtmlForAddColumn($columns_list));
$response->addHTML(
@ -235,7 +235,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
*/
if (! $tbl_is_view
&& ! $db_is_information_schema
&& ! $db_is_system_schema
&& 'ARCHIVE' != $tbl_storage_engine
) {
//return the list of index
@ -255,7 +255,7 @@ if ($cfg['ShowStats']) {
//get table stats in HTML format
$tablestats = PMA_getHtmlForDisplayTableStats(
$showtable, $table_info_num_rows, $tbl_is_view,
$db_is_information_schema, $tbl_storage_engine,
$db_is_system_schema, $tbl_storage_engine,
$url_query, $tbl_collation
);
//returning the response in JSON format to be used by Ajax

88
libraries/structure.lib.php
View File

@ -19,14 +19,14 @@ if (!defined('PHPMYADMIN')) {
* @param string $tbl_url_query table url query
* @param array $titles titles and icons for action links
* @param string $truename table name
* @param boolean $db_is_information_schema is database information schema or not
* @param boolean $db_is_system_schema is database information schema or not
* @param string $url_query url query
*
* @return array ($browse_table, $search_table, $browse_table_label, $empty_table,
* $tracking_icon)
*/
function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_query,
$titles, $truename, $db_is_information_schema, $url_query
$titles, $truename, $db_is_system_schema, $url_query
) {
$empty_table = '';
@ -56,7 +56,7 @@ function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_quer
. '&amp;pos=0" title="' . $current_table['TABLE_COMMENT'] . '">'
. $truename . '</a>';
if (!$db_is_information_schema) {
if (!$db_is_system_schema) {
$empty_table = '<a class="truncate_table_anchor ajax"';
$empty_table .= ' href="sql.php?' . $tbl_url_query
. '&amp;sql_query=';
@ -143,7 +143,7 @@ function PMA_getTableDropQueryAndMessage($table_is_view, $current_table)
*
* @param integer $num_tables number of tables
* @param boolean $server_slave_status server slave state
* @param boolean $db_is_information_schema whether database is information
* @param boolean $db_is_system_schema whether database is information
* schema or not
* @param integer $sum_entries sum entries
* @param string $db_collation collation of given db
@ -158,7 +158,7 @@ function PMA_getTableDropQueryAndMessage($table_is_view, $current_table)
* @return string $html_output
*/
function PMA_getHtmlBodyForTableSummary($num_tables, $server_slave_status,
$db_is_information_schema, $sum_entries, $db_collation, $is_show_stats,
$db_is_system_schema, $sum_entries, $db_collation, $is_show_stats,
$sum_size, $overhead_size, $create_time_all, $update_time_all,
$check_time_all, $sum_row_count_pre
) {
@ -182,7 +182,7 @@ function PMA_getHtmlBodyForTableSummary($num_tables, $server_slave_status,
if ($server_slave_status) {
$html_output .= '<th>' . __('Replication') . '</th>' . "\n";
}
$html_output .= '<th colspan="'. ($db_is_information_schema ? 3 : 6) . '">'
$html_output .= '<th colspan="'. ($db_is_system_schema ? 3 : 6) . '">'
. __('Sum')
. '</th>';
$html_output .= '<th class="value tbl_rows">'
@ -264,14 +264,14 @@ function PMA_getHtmlBodyForTableSummary($num_tables, $server_slave_status,
* @param string $pmaThemeImage pma theme image url
* @param string $text_dir url for text directory
* @param string $overhead_check overhead check
* @param boolean $db_is_information_schema whether database is information
* @param boolean $db_is_system_schema whether database is information
* schema or not
* @param string $hidden_fields hidden fields
*
* @return string $html_output
*/
function PMA_getHtmlForCheckAllTables($pmaThemeImage, $text_dir,
$overhead_check, $db_is_information_schema, $hidden_fields
$overhead_check, $db_is_system_schema, $hidden_fields
) {
$html_output = '<div class="clearfloat">';
$html_output .= '<img class="selectallarrow" '
@ -300,7 +300,7 @@ function PMA_getHtmlForCheckAllTables($pmaThemeImage, $text_dir,
$html_output .= '<option value="print" >'
. __('Print view') . '</option>' . "\n";
if (!$db_is_information_schema
if (!$db_is_system_schema
&& !$GLOBALS['cfg']['DisableMultiTableMaintenance']
) {
$html_output .= '<option value="empty_tbl" >'
@ -426,7 +426,7 @@ function PMA_getTimeForCreateUpdateCheck($current_table, $time_label, $time_all)
* @param string $browse_table browse table action link
* @param string $tbl_url_query table url query
* @param string $search_table search table action link
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param array $titles titles array
* @param string $empty_table empty table action link
* @param string $drop_query table dropt query
@ -449,7 +449,7 @@ function PMA_getHtmlForStructureTableRow(
$curr, $odd_row, $table_is_view, $current_table,
$browse_table_label, $tracking_icon,$server_slave_status,
$browse_table, $tbl_url_query, $search_table,
$db_is_information_schema,$titles, $empty_table, $drop_query, $drop_message,
$db_is_system_schema,$titles, $empty_table, $drop_query, $drop_message,
$collation, $formatted_size, $unit, $overhead, $create_time, $update_time,
$check_time,$is_show_stats, $ignored, $do, $colspan_for_structure
) {
@ -485,12 +485,12 @@ function PMA_getHtmlForStructureTableRow(
. $titles['Structure'] . '</a></td>';
$html_output .= '<td class="center">' . $search_table . '</td>';
if (! $db_is_information_schema) {
if (! $db_is_system_schema) {
$html_output .= PMA_getHtmlForInsertEmptyDropActionLinks(
$tbl_url_query, $table_is_view,
$titles, $empty_table, $current_table, $drop_query, $drop_message
);
} // end if (! $db_is_information_schema)
} // end if (! $db_is_system_schema)
// there is a null value in the ENGINE
// - when the table needs to be repaired, or
@ -511,7 +511,7 @@ function PMA_getHtmlForStructureTableRow(
} else {
$html_output .= PMA_getHtmlForRepairtable(
$colspan_for_structure,
$db_is_information_schema
$db_is_system_schema
);
} // end if (isset($current_table['TABLE_ROWS'])) else
$html_output .= '</tr>';
@ -719,16 +719,16 @@ function PMA_getHtmlForViewTable($is_show_stats)
* display "in use" below for a table that needs to be repaired
*
* @param integer $colspan_for_structure colspan for structure
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
*
* @return string HTML snippet
*/
function PMA_getHtmlForRepairtable(
$colspan_for_structure,
$db_is_information_schema
$db_is_system_schema
) {
return '<td colspan="'
. ($colspan_for_structure - ($db_is_information_schema ? 5 : 8)) . '"'
. ($colspan_for_structure - ($db_is_system_schema ? 5 : 8)) . '"'
. 'class="center">'
. __('in use')
. '</td>';
@ -737,16 +737,16 @@ function PMA_getHtmlForRepairtable(
/**
* display table header (<table><thead>...</thead><tbody>)
*
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param boolean $replication whether to sho replication status
*
* @return string html data
*/
function PMA_tableHeader($db_is_information_schema = false, $replication = false)
function PMA_tableHeader($db_is_system_schema = false, $replication = false)
{
$cnt = 0; // Let's count the columns...
if ($db_is_information_schema) {
if ($db_is_system_schema) {
$action_colspan = 3;
} else {
$action_colspan = 6;
@ -1004,7 +1004,7 @@ function PMA_getServerSlaveStatus($server_slave_status, $truename)
* $overhead_unit, $overhead_size, $table_is_view
*
* @param array $current_table current table
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param boolean $is_show_stats whether stats show or not
* @param boolean $table_is_view whether table is view or not
* @param double $sum_size totle table size
@ -1012,7 +1012,7 @@ function PMA_getServerSlaveStatus($server_slave_status, $truename)
*
* @return array
*/
function PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schema,
function PMA_getStuffForEngineTypeTable($current_table, $db_is_system_schema,
$is_show_stats, $table_is_view, $sum_size, $overhead_size
) {
$formatted_size = '-';
@ -1032,7 +1032,7 @@ function PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schem
case 'Maria' :
list($current_table, $formatted_size, $unit, $formatted_overhead,
$overhead_unit, $overhead_size, $sum_size) = PMA_getValuesForAriaTable(
$db_is_information_schema, $current_table, $is_show_stats,
$db_is_system_schema, $current_table, $is_show_stats,
$sum_size, $overhead_size, $formatted_size, $unit,
$formatted_overhead, $overhead_unit
);
@ -1092,7 +1092,7 @@ function PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schem
* $current_table, $formatted_size, $unit, $formatted_overhead,
* $overhead_unit, $overhead_size
*
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param array $current_table current table
* @param boolean $is_show_stats whether stats show or not
* @param double $sum_size sum size
@ -1104,11 +1104,11 @@ function PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schem
*
* @return array
*/
function PMA_getValuesForAriaTable($db_is_information_schema, $current_table,
function PMA_getValuesForAriaTable($db_is_system_schema, $current_table,
$is_show_stats, $sum_size, $overhead_size, $formatted_size, $unit,
$formatted_overhead, $overhead_unit
) {
if ($db_is_information_schema) {
if ($db_is_system_schema) {
$current_table['Rows'] = PMA_Table::countRecords(
$GLOBALS['db'], $current_table['Name']
);
@ -1181,13 +1181,13 @@ function PMA_getValuesForInnodbTable($current_table, $is_show_stats, $sum_size)
/**
* Get the HTML snippet for structure table table header
*
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param boolean $tbl_is_view whether table is view or not
*
* @return string $html_output
*/
function PMA_getHtmlForTableStructureHeader(
$db_is_information_schema,
$db_is_system_schema,
$tbl_is_view
) {
$html_output = '<thead>';
@ -1202,7 +1202,7 @@ function PMA_getHtmlForTableStructureHeader(
. '<th>' . __('Default') . '</th>'
. '<th>' . __('Extra') . '</th>';
if ($db_is_information_schema || $tbl_is_view) {
if ($db_is_system_schema || $tbl_is_view) {
$html_output .= '<th>' . __('View') . '</th>';
} else { /* see tbl_structure.js, function moreOptsMenuResize() */
$colspan = 9;
@ -1239,7 +1239,7 @@ function PMA_getHtmlForTableStructureHeader(
* UNSIGNED ZEROFILL,
* on update CURRENT_TIMESTAMP)
* @param boolean $tbl_is_view whether tables is view or not
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param string $url_query url query
* @param string $field_encoded field encoded
* @param array $titles tittles array
@ -1249,7 +1249,7 @@ function PMA_getHtmlForTableStructureHeader(
*/
function PMA_getHtmlTableStructureRow($row, $rownum,
$displayed_field_name, $type_nowrap, $extracted_columnspec, $type_mime,
$field_charset, $attribute, $tbl_is_view, $db_is_information_schema,
$field_charset, $attribute, $tbl_is_view, $db_is_system_schema,
$url_query, $field_encoded, $titles, $table
) {
$html_output = '<td class="center">'
@ -1301,7 +1301,7 @@ function PMA_getHtmlTableStructureRow($row, $rownum,
$html_output .= '<td class="nowrap">' . strtoupper($row['Extra']) . '</td>';
$html_output .= PMA_getHtmlForDropColumn(
$tbl_is_view, $db_is_information_schema,
$tbl_is_view, $db_is_system_schema,
$url_query, $field_encoded,
$titles, $table, $row
);
@ -1313,7 +1313,7 @@ function PMA_getHtmlTableStructureRow($row, $rownum,
* Get HTML code for "Drop" Action link
*
* @param boolean $tbl_is_view whether tables is view or not
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param string $url_query url query
* @param string $field_encoded field encoded
* @param array $titles tittles array
@ -1322,12 +1322,12 @@ function PMA_getHtmlTableStructureRow($row, $rownum,
*
* @return string $html_output
*/
function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_information_schema,
function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_system_schema,
$url_query, $field_encoded, $titles, $table, $row
) {
$html_output = '';
if (! $tbl_is_view && ! $db_is_information_schema) {
if (! $tbl_is_view && ! $db_is_system_schema) {
$html_output .= '<td class="edit center">'
. '<a class="change_column_anchor ajax"'
. ' href="tbl_structure.php?'
@ -1362,13 +1362,13 @@ function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_information_schema,
* @param string $pmaThemeImage pma theme image url
* @param string $text_dir test directory
* @param boolean $tbl_is_view whether table is view or not
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param string $tbl_storage_engine table storage engine
*
* @return string $html_output
*/
function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir,
$tbl_is_view, $db_is_information_schema, $tbl_storage_engine
$tbl_is_view, $db_is_system_schema, $tbl_storage_engine
) {
$html_output = '<img class="selectallarrow" '
. 'src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png' . '"'
@ -1386,7 +1386,7 @@ function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir,
__('Browse'), 'b_browse.png', 'browse'
);
if (! $tbl_is_view && ! $db_is_information_schema) {
if (! $tbl_is_view && ! $db_is_system_schema) {
$html_output .= PMA_Util::getButtonOrImage(
'submit_mult', 'mult_submit change_columns_anchor ajax',
'submit_mult_change', __('Change'), 'b_edit.png', 'change'
@ -1501,21 +1501,21 @@ function PMA_getHtmlForEditView($url_params)
*
* @param string $url_query url query
* @param boolean $tbl_is_view whether table is view or not
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param string $tbl_storage_engine table storage engine
* @param array $cfgRelation current relation parameters
*
* @return string $html_output
*/
function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view,
$db_is_information_schema, $tbl_storage_engine, $cfgRelation
$db_is_system_schema, $tbl_storage_engine, $cfgRelation
) {
$html_output = '<a href="tbl_printview.php?' . $url_query
. '" target="print_view">'
. PMA_Util::getIcon('b_print.png', __('Print view'), true)
. '</a>';
if (! $tbl_is_view && ! $db_is_information_schema) {
if (! $tbl_is_view && ! $db_is_system_schema) {
// if internal relations are available, or foreign keys are supported
// ($tbl_storage_engine comes from libraries/tbl_info.inc.php
@ -2106,7 +2106,7 @@ function PMA_getActionTitlesArray()
* @param array $showtable full table status info
* @param integer $table_info_num_rows table info number of rows
* @param boolean $tbl_is_view whether table is view or not
* @param boolean $db_is_information_schema whether db is information schema or not
* @param boolean $db_is_system_schema whether db is information schema or not
* @param string $tbl_storage_engine table storage engine
* @param string $url_query url query
* @param string $tbl_collation table collation
@ -2114,7 +2114,7 @@ function PMA_getActionTitlesArray()
* @return string $html_output
*/
function PMA_getHtmlForDisplayTableStats($showtable, $table_info_num_rows,
$tbl_is_view, $db_is_information_schema, $tbl_storage_engine, $url_query,
$tbl_is_view, $db_is_system_schema, $tbl_storage_engine, $url_query,
$tbl_collation
) {
$html_output = '<div id="tablestatistics">';
@ -2185,7 +2185,7 @@ function PMA_getHtmlForDisplayTableStats($showtable, $table_info_num_rows,
. '<legend>' . __('Information') . '</legend>'
. '<a id="showusage"></a>';
if (! $tbl_is_view && ! $db_is_information_schema) {
if (! $tbl_is_view && ! $db_is_system_schema) {
$html_output .= '<table id="tablespaceusage" class="data">'
. '<caption class="tblHeaders">' . __('Space usage') . '</caption>'
. '<tbody>';

2
libraries/tbl_common.inc.php
View File

@ -17,7 +17,7 @@ require_once './libraries/bookmark.lib.php';
// Check parameters
PMA_Util::checkParameters(array('db', 'table'));
$db_is_information_schema = $GLOBALS['dbi']->isSystemSchema($db);
$db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
/**
* Set parameters for links

6
tbl_operations.php
View File

@ -321,12 +321,12 @@ $response->addHTML(
)
);
if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
if (! (isset($db_is_system_schema) && $db_is_information_schema)) {
$truncate_table_url_params = array();
$drop_table_url_params = array();
if (! $tbl_is_view
&& ! (isset($db_is_information_schema) && $db_is_information_schema)
&& ! (isset($db_is_system_schema) && $db_is_information_schema)
) {
$this_sql_query = 'TRUNCATE TABLE '
. PMA_Util::backquote($GLOBALS['table']);
@ -343,7 +343,7 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
)
);
}
if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
if (! (isset($db_is_system_schema) && $db_is_information_schema)) {
$this_sql_query = 'DROP TABLE '
. PMA_Util::backquote($GLOBALS['table']);
$drop_table_url_params = array_merge(

6
test/libraries/PMA_structure_test.php
View File

@ -83,7 +83,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase
'NoEmpty' => 'NoEmpty1',
);;
$truename = 'truename';
$db_is_information_schema = null;
$db_is_system_schema = null;
$url_query = 'url_query';
//$table_is_view = true;
@ -92,7 +92,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase
$empty_table, $tracking_icon
) = PMA_getHtmlForActionLinks(
$current_table, $table_is_view, $tbl_url_query,
$titles, $truename, $db_is_information_schema, $url_query
$titles, $truename, $db_is_system_schema, $url_query
);
//$browse_table
@ -145,7 +145,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase
$empty_table, $tracking_icon
) = PMA_getHtmlForActionLinks(
$current_table, $table_is_view, $tbl_url_query,
$titles, $truename, $db_is_information_schema, $url_query
$titles, $truename, $db_is_system_schema, $url_query
);
//$browse_table