Merge branch 'QA_4_5'
This commit is contained in:
commit
1411ffaaef
@ -34,6 +34,7 @@ phpMyAdmin - ChangeLog
|
||||
- issue #11522 Strange behavior on table rename
|
||||
- issue #11539 Rename table does not result in refresh in left panel
|
||||
- issue #11541 Missing arguments for PMA_Table::generateAlter()
|
||||
- issue #11544 Notices about undefined indexes on structure pages of information_schema tables
|
||||
|
||||
4.5.0.2 (2015-09-25)
|
||||
- issue #11497 Incorrect indexes when exporting
|
||||
|
||||
@ -318,6 +318,7 @@ class TableStructureController extends TableController
|
||||
$db = &$this->db;
|
||||
$table = &$this->table;
|
||||
include_once 'libraries/tbl_common.inc.php';
|
||||
$this->_db_is_system_schema = $db_is_system_schema;
|
||||
$this->_url_query = $url_query
|
||||
. '&goto=tbl_structure.php&back=tbl_structure.php';
|
||||
$url_params['goto'] = 'tbl_structure.php';
|
||||
@ -1201,7 +1202,7 @@ class TableStructureController extends TableController
|
||||
/**
|
||||
* Work on the table
|
||||
*/
|
||||
if ($this->_tbl_is_view) {
|
||||
if ($this->_tbl_is_view && ! $this->_db_is_system_schema) {
|
||||
$item = $this->dbi->fetchSingleRow(
|
||||
sprintf(
|
||||
"SELECT `VIEW_DEFINITION`, `CHECK_OPTION`, `DEFINER`,
|
||||
|
||||
@ -134,7 +134,7 @@
|
||||
<?php echo PMA\Template::get('table/structure/move_columns_dialog')->render(); ?>
|
||||
<!--Work on the table-->
|
||||
<div id="structure-action-links">
|
||||
<?php if ($tbl_is_view): ?>
|
||||
<?php if ($tbl_is_view && ! $db_is_system_schema): ?>
|
||||
<?php echo PMA_Util::linkOrButton(
|
||||
$edit_view_url,
|
||||
PMA_Util::getIcon('b_edit.png', __('Edit view'), true)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user