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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2010-11-28 14:40:12 +01:00
parent 368295026f 1199f7a3db
commit 7ba8cc2def
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -122,6 +122,8 @@
- bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character.
+ rfe #3111455 [interface] Column highlighting and marking in table view + rfe #3111455 [interface] Column highlighting and marking in table view
+ Visual query builder + Visual query builder
- patch #3112792 [navi] Left panel table grouping incorrect,
thanks to garas - garas
3.3.9.0 (not yet released) 3.3.9.0 (not yet released)
- bug [doc] Fix references to MySQL doc - bug [doc] Fix references to MySQL doc

6
libraries/select_lang.lib.php
View File

@@ -343,10 +343,8 @@ function PMA_langList()
/* Open the directory */ /* Open the directory */
$handle = @opendir($GLOBALS['lang_path']); $handle = @opendir($GLOBALS['lang_path']);
/* This can happen if the kit is English-only */
if ($handle === FALSE) { if ($handle === FALSE) {
trigger_error('phpMyAdmin: path not found: '
. $GLOBALS['lang_path'] . ', check your language directory.',
E_USER_WARNING);
return $result; return $result;
} }
@@ -363,7 +361,7 @@ function PMA_langList()
} }
/** /**
* @global string path to the translations directory * @global string path to the translations directory; may be absent if the kit is English-only
*/ */
$GLOBALS['lang_path'] = './locale/'; $GLOBALS['lang_path'] = './locale/';

2
navigation.php
View File

@@ -606,7 +606,7 @@ function PMA_displayTableList($tables, $visible = false,
echo '</li>' . "\n"; echo '</li>' . "\n";
} elseif (is_array($table)) { } elseif (is_array($table)) {
// the table was not grouped because it is the only one with its prefix // the table was not grouped because it is the only one with its prefix
if (isset($table['is' . $sep . 'group'])) { while (isset($table['is' . $sep . 'group'])) {
// get the array with the actual table information // get the array with the actual table information
foreach ($table as $value) { foreach ($table as $value) {
if(is_array($value)) { if(is_array($value)) {