diff --git a/ChangeLog b/ChangeLog index fa5ef4d855..815f3a7597 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ phpMyAdmin - ChangeLog - bug #4297 DROP DATABASE tick box in export no longer works - bug #4291 Unable to export comments in OpenDocument text format - bug #4299 Deletion even when the user says "No" to the confirmation message +- bug #4303 "New" link in navi panel is shown even if no privileges 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry diff --git a/js/functions.js b/js/functions.js index d57cdb7f3f..c8c0444767 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1802,7 +1802,8 @@ function PMA_createProfilingChartJqplot(target, data) }, legend: { show: true, - location: 'e' + location: 'e', + rendererOptions: {numberColumns: 2} }, // from http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines#Color_Palette seriesColors: [ diff --git a/libraries/navigation/Nodes/Node_Database_Container.class.php b/libraries/navigation/Nodes/Node_Database_Container.class.php index 6396b03cb0..c76da069d1 100644 --- a/libraries/navigation/Nodes/Node_Database_Container.class.php +++ b/libraries/navigation/Nodes/Node_Database_Container.class.php @@ -29,19 +29,21 @@ class Node_Database_Container extends Node { parent::__construct($name, Node::CONTAINER); - $new = PMA_NodeFactory::getInstance( - 'Node', _pgettext('Create new database', 'New') - ); - $new->isNew = $GLOBALS['is_create_db_priv']; - $new->icon = PMA_Util::getImage('b_newdb.png', ''); - $new->links = array( - 'text' => 'server_databases.php?server=' . $GLOBALS['server'] - . '&token=' . $GLOBALS['token'], - 'icon' => 'server_databases.php?server=' . $GLOBALS['server'] - . '&token=' . $GLOBALS['token'], - ); - $new->classes = 'new_database italics'; - $this->addChild($new); + if ($GLOBALS['is_create_db_priv']) { + $new = PMA_NodeFactory::getInstance( + 'Node', _pgettext('Create new database', 'New') + ); + $new->isNew = true; + $new->icon = PMA_Util::getImage('b_newdb.png', ''); + $new->links = array( + 'text' => 'server_databases.php?server=' . $GLOBALS['server'] + . '&token=' . $GLOBALS['token'], + 'icon' => 'server_databases.php?server=' . $GLOBALS['server'] + . '&token=' . $GLOBALS['token'], + ); + $new->classes = 'new_database italics'; + $this->addChild($new); + } } } -?> \ No newline at end of file +?> diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index ab1a4fc55d..840aa0687a 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -506,6 +506,7 @@ function PMA_getHtmlForProfilingChart($url_query, $db, $profiling_results) EOT; $profiling_table .= ""; + $profiling_table .= "
"; //require_once 'libraries/chart.lib.php'; $profiling_table .= '