diff --git a/ChangeLog b/ChangeLog index f9ec21d78..69a860d86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Uzbek update, thanks to Orzu Samarqandiy + rfe #2958013 [import] After import, also list uploaded filename, thanks to Pavel Konnikov and Herman van Rink ++ patch #2974341 [structure] Clicking on table name in db Structure should + Browse the table if possible, thanks to bhdouglass - dougboybhd 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/Documentation.html b/Documentation.html index 4c5157dde..e7880a919 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4342,20 +4342,23 @@ chmod o+rwx tmp

The following method is preferred for new developers:

-
  1. fetch the current SVN tree over anonymous SVN:
    - svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin
    +
    1. fetch the current git repository over anonymous git:
      + git clone + git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
    2. add your stuff
    3. generate patch with your changes: - svn diff
      + git diff > xxx.diff
    4. -
    5. put the patch inside the submit your patch via the patch tracker of the phpMyAdmin project.
    -

    Write access to the SVN tree is granted only to experienced developers who +

    More details on git are available on our wiki.

    + +

    Write access to the repository is granted only to experienced developers who have already contributed something useful to phpMyAdmin.
    Also, have a look at the Developers section.

    diff --git a/db_structure.php b/db_structure.php index 2111edd81..a4d99cbb7 100644 --- a/db_structure.php +++ b/db_structure.php @@ -300,9 +300,11 @@ foreach ($tables as $keyname => $each_table) { if ($each_table['TABLE_ROWS'] > 0) { $browse_table = '' . $titles['Browse'] . ''; $search_table = '' . $titles['Search'] . ''; + $browse_table_label = '' . $truename . ''; } else { $browse_table = $titles['NoBrowse']; $search_table = $titles['NoSearch']; + $browse_table_label = '' . $truename . ''; } if (! $db_is_information_schema) { @@ -382,8 +384,7 @@ foreach ($tables as $keyname => $each_table) { /> - + ' : ''. $do ? ' REPLICATED' : ''; ?> diff --git a/tbl_row_action.php b/tbl_row_action.php index d72c7d537..efcc74d7b 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -43,7 +43,7 @@ if (isset($_REQUEST['submit_mult'])) { $submit_mult = 'row_export'; } -// garvin: If the 'Ask for confirmation' button was pressed, this can only come +// If the 'Ask for confirmation' button was pressed, this can only come // from 'delete' mode, so we set it straight away. if (isset($_REQUEST['mult_btn'])) { $submit_mult = 'row_delete';