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:
Weblate 2014-04-14 19:05:06 +02:00
commit b77cc7f1ce
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/navigation/NavigationTree.class.php
View File

@ -1202,12 +1202,10 @@ class PMA_NavigationTree
private function _quickWarp()
{
$retval = '<div id="pma_quick_warp">';
if ($GLOBALS['cfg']['NumRecentTables'] > 0)
{
if ($GLOBALS['cfg']['NumRecentTables'] > 0) {
$retval .= PMA_RecentFavoriteTable::getInstance('recent')->getHtml();
}
if ($GLOBALS['cfg']['NumFavoriteTables'] > 0)
{
if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
$retval .= PMA_RecentFavoriteTable::getInstance('favorite')->getHtml();
}
$retval .= '<div class="clearfloat"></div>';

6
libraries/structure.lib.php
View File

@ -2685,7 +2685,7 @@ function PMA_displayTableBrowseForSelectedColumns($db, $table, $goto,
* Function to check if a table is already in favorite list.
*
* @param string $db current database
* @param string $table current table
* @param string $current_table current table
*
* @return true|false
*/
@ -2711,7 +2711,9 @@ function PMA_checkFavoriteTable($db, $current_table)
function PMA_getHtmlForFavoriteAnchor($db, $current_table, $titles)
{
$html_output = '<a ';
$html_output .= 'id="' . preg_replace('/\s+/', '', $current_table['TABLE_NAME']) . '_favorite_anchor" ';
$html_output .= 'id="' . preg_replace(
'/\s+/', '', $current_table['TABLE_NAME']
) . '_favorite_anchor" ';
$html_output .= 'class="ajax favorite_table_anchor';
// Check if current table is already in favorite list.