The branch, gettext has been updated via 1ce73794ea669c0a37ad65a83c14a1286b7b2371 (commit) via 46c6b06617d3a2a41477972ac6e89b13d5e6205a (commit) via bbad02a5a1c78b56210c6f9cd85261106ff29aef (commit) via 9785bbc561db3d64cd53a8cf86823d37eac6fafb (commit) via f6e3ae57c50edb17dad905ca47827e7de1f63b15 (commit) via 291f2a1d1d97299b3b47dc2b9871e3646ae7d3f8 (commit) via 4c8addeee277e63c8801d0a447a3006ec307f213 (commit) via dcb6cf7cde8f20c79e57c90ede35889c59f6182a (commit) via 2a567fdf155fef796388f7e7358ccafb8ef420e6 (commit) via 4e4f5f7eaf4be5cc5b1a2b6d72b47eea97ed13ae (commit) from d2a521f369de842a3130bfeafd3816a6d24614fa (commit)

- Log ----------------------------------------------------------------- commit 1ce73794ea669c0a37ad65a83c14a1286b7b2371 Merge: 46c6b06617d3a2a41477972ac6e89b13d5e6205a 4c8addeee277e63c8801d0a447a3006ec307f213 Author: Michal Čihař michal@cihar.com Date: Sat Mar 27 00:31:53 2010 +0100

Merge remote branch 'pootle/gettext' into gettext

commit 46c6b06617d3a2a41477972ac6e89b13d5e6205a Merge: d2a521f369de842a3130bfeafd3816a6d24614fa bbad02a5a1c78b56210c6f9cd85261106ff29aef Author: Michal Čihař michal@cihar.com Date: Sat Mar 27 00:30:38 2010 +0100

Merge branch 'master' into gettext

commit 4c8addeee277e63c8801d0a447a3006ec307f213 Author: rink rink@initfour.nl Date: Fri Mar 26 15:46:23 2010 +0200

Translation update done using Pootle.

commit dcb6cf7cde8f20c79e57c90ede35889c59f6182a Author: rink rink@initfour.nl Date: Fri Mar 26 15:42:54 2010 +0200

Translation update done using Pootle.

commit 2a567fdf155fef796388f7e7358ccafb8ef420e6 Author: rink rink@initfour.nl Date: Fri Mar 26 15:42:02 2010 +0200

Translation update done using Pootle.

commit 4e4f5f7eaf4be5cc5b1a2b6d72b47eea97ed13ae Author: rink rink@initfour.nl Date: Fri Mar 26 15:41:44 2010 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 2 ++ libraries/List_Database.class.php | 2 +- libraries/Table.class.php | 14 +++++++------- libraries/common.lib.php | 11 ++++++++--- libraries/display_tbl.lib.php | 19 +++++++++---------- libraries/display_tbl_links.lib.php | 2 +- libraries/header.inc.php | 2 +- libraries/header_printview.inc.php | 4 ++-- libraries/tbl_links.inc.php | 1 + libraries/tbl_properties.inc.php | 6 +++--- libraries/tbl_replace_fields.inc.php | 8 ++++---- main.php | 1 - navigation.php | 2 +- pdf_pages.php | 2 +- po/nl.po | 9 +++------ sql.php | 8 ++++---- tbl_addfield.php | 6 +++--- tbl_alter.php | 2 +- tbl_change.php | 6 +++--- tbl_create.php | 6 +++--- tbl_replace.php | 3 ++- tbl_row_action.php | 4 ++-- tbl_structure.php | 4 ++-- transformation_wrapper.php | 2 +- 24 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 69a860d..51febbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY - [navi] Changed link to git repository on main page - bug #2972232 [menu] Import menu tab not present on main page +- patch #2976790 [menu] Go to the upper level after table DROP, + thanks to Kaarel Nummert - kaarelnu

3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 8997790..34e4cb6 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -295,7 +295,7 @@ require_once './libraries/List.class.php'; }

foreach ($this->getLimitedItems($offset, $count) as $key => $db) { - // garvin: Get comments from PMA comments table + // Get comments from PMA comments table $db_tooltip = '';

if (isset($db_tooltips[$db])) { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 25e3709..9e80660 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -720,7 +720,7 @@ class PMA_Table

$GLOBALS['sql_query'] .= "\n" . $drop_query . ';';

- // garvin: If an existing table gets deleted, maintain any + // If an existing table gets deleted, maintain any // entries for the PMA_* tables $maintain_relations = true; } @@ -800,7 +800,7 @@ class PMA_Table $sql_drop_query .= ' ' . $source; PMA_DBI_query($sql_drop_query);

- // garvin: Move old entries from PMA-DBs to new table + // Move old entries from PMA-DBs to new table if ($GLOBALS['cfgRelation']['commwork']) { $remove_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) . ' SET table_name = '' . PMA_sqlAddslashes($target_table) . '', ' @@ -811,7 +811,7 @@ class PMA_Table unset($remove_query); }

- // garvin: updating bookmarks is not possible since only a single table is moved, + // updating bookmarks is not possible since only a single table is moved, // and not the whole DB.

if ($GLOBALS['cfgRelation']['displaywork']) { @@ -843,7 +843,7 @@ class PMA_Table }

/** - * @todo garvin: Can't get moving PDFs the right way. The page numbers + * @todo Can't get moving PDFs the right way. The page numbers * always get screwed up independently from duplication because the * numbers do not seem to be stored on a per-database basis. Would * the author of pdf support please have a look at it? @@ -890,7 +890,7 @@ class PMA_Table // end if ($move) } else { // we are copying - // garvin: Create new entries as duplicates from old PMA DBs + // Create new entries as duplicates from old PMA DBs if ($what != 'dataonly' && !isset($maintain_relations)) { if ($GLOBALS['cfgRelation']['commwork']) { // Get all comments and MIME-Types for current table @@ -951,7 +951,7 @@ class PMA_Table PMA_Table::duplicateInfo('designerwork', 'designer_coords', $get_fields, $where_fields, $new_fields);

/** - * @todo garvin: Can't get duplicating PDFs the right way. The + * @todo Can't get duplicating PDFs the right way. The * page numbers always get screwed up independently from * duplication because the numbers do not seem to be stored on a * per-database basis. Would the author of pdf support please @@ -1057,7 +1057,7 @@ class PMA_Table /** * @todo move into extra function PMA_Relation::renameTable($new_name, $old_name, $new_db, $old_db) */ - // garvin: Move old entries from comments to new table + // Move old entries from comments to new table require_once './libraries/relation.lib.php'; $GLOBALS['cfgRelation'] = PMA_getRelationsParam(); if ($GLOBALS['cfgRelation']['commwork']) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d103d06..a2ce680 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -591,7 +591,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', $error_msg_output .= '<br />' . "\n"; } // --- - // modified to show me the help on sql errors (Michael Keck) + // modified to show the help on sql errors $error_msg_output .= ' <p><strong>' . $GLOBALS['strSQLQuery'] . ':</strong>' . "\n"; if (strstr(strtolower($formatted_sql), 'select')) { // please show me help to the error on select $error_msg_output .= PMA_showMySQLDocu('SQL-Syntax', 'SELECT'); @@ -628,7 +628,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', $error_message = htmlspecialchars($error_message); $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); } - // modified to show me the help on error-returns (Michael Keck) + // modified to show the help on error-returns // (now error-messages-server) $error_msg_output .= '<p>' . "\n" . ' <strong>' . $GLOBALS['strMySQLSaid'] . '</strong>' @@ -1583,6 +1583,11 @@ function PMA_generate_html_tab($tab, $url_params = array()) $tab['attr'] .= ' title="' . htmlspecialchars($tab['warning']) . '"'; }

+ // If there are any tab specific URL parameters, merge those with the general URL parameters + if(! empty($tab['url_params']) && is_array($tab['url_params'])) { + $url_params = array_merge($url_params, $tab['url_params']); + } + // build the link if (!empty($tab['link'])) { $tab['link'] = htmlentities($tab['link']); @@ -2140,7 +2145,7 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1, $pages[] = $i; }

- // garvin: Based on the number of results we add the specified + // Based on the number of results we add the specified // $percent percentage to each page number, // so that we have a representing page number every now and then to // immediately jump to specific pages. diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index acc08c8..13eb093 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -173,7 +173,7 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total) // so don't test this number here, it would remove the possibility // of sorting VIEW results. if (isset($unlim_num_rows) && $unlim_num_rows < 2 && ! PMA_Table::isView($db, $table)) { - // garvin: force display of navbar for vertical/horizontal display-choice. + // force display of navbar for vertical/horizontal display-choice. // $do_display['nav_bar'] = (string) '0'; $do_display['sort_lnk'] = (string) '0'; } @@ -723,8 +723,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $select_expr = $analyzed_sql[0]['select_expr_clause']; }

- // garvin: See if we have to highlight any header fields of a WHERE query. - // Uses SQL-Parser results. + // See if we have to highlight any header fields of a WHERE query. + // Uses SQL-Parser results. $highlight_columns = array(); if (isset($analyzed_sql) && isset($analyzed_sql[0]) && isset($analyzed_sql[0]['where_clause_identifiers'])) { @@ -738,7 +738,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ }

for ($i = 0; $i < $fields_cnt; $i++) { - // garvin: See if this column should get highlight because it's used in the + // See if this column should get highlight because it's used in the // where-query. if (isset($highlight_columns[$fields_meta[$i]->name]) || isset($highlight_columns[PMA_backquote($fields_meta[$i]->name)])) { $condition_field = true; @@ -841,8 +841,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $order_url = 'sql.php' . PMA_generate_common_url($_url_params);

// 2.1.5 Displays the sorting URL - // added 20004-06-09: Michael Keck mail@michaelkeck.de - // enable sort order swapping for image + // enable sort order swapping for image $order_link_params = array(); if (isset($order_img) && $order_img!='') { if (strstr($order_img, 'asc')) { @@ -1191,7 +1190,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { for ($i = 0; $i < $fields_cnt; ++$i) { $meta = $fields_meta[$i]; $pointer = $i; - // garvin: See if this column should get highlight because it's used in the + // See if this column should get highlight because it's used in the // where-query. if (isset($highlight_columns) && (isset($highlight_columns[$meta->name]) || isset($highlight_columns[PMA_backquote($meta->name)]))) { $condition_field = true; @@ -1212,7 +1211,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } }// end if

- // garvin: Wrap MIME-transformations. [MIME] + // Wrap MIME-transformations. [MIME] $default_function = 'default_function'; // default_function $transform_function = $default_function; $transform_options = array(); @@ -1334,7 +1333,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n"; } elseif ($row[$i] != '') { - // garvin: if a transform function for blob is set, none of these replacements will be made + // if a transform function for blob is set, none of these replacements will be made if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { $row[$i] = PMA_substr($row[$i], 0, $GLOBALS['cfg']['LimitChars']) . '...'; } @@ -1385,7 +1384,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } }

- // garvin: transform functions may enable no-wrapping: + // transform functions may enable no-wrapping: $function_nowrap = $transform_function . '_nowrap'; $bool_nowrap = (($default_function != $transform_function && function_exists($function_nowrap)) ? $function_nowrap($transform_options) : false);

diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index 8d904c0..40a3fd1 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * modified 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de> + * * - bugfix for select all checkboxes * - copy right to left (or left to right) if user click on a check box * - reversed the right modify links: 1. drop, 2. edit, 3. checkbox diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 24423a5..18a327b 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -22,7 +22,7 @@ if (empty($GLOBALS['is_header_sent'])) { require_once './libraries/ob.lib.php'; PMA_outBufferPre();

- // garvin: For re-usability, moved http-headers and stylesheets + // For re-usability, moved http-headers and stylesheets // to a seperate file. It can now be included by header.inc.php, // querywindow.php.

diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 6c37db0..962c590 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -21,8 +21,8 @@ PMA_outBufferPre(); PMA_checkParameters(array('db', 'full_sql_query'));

-// garvin: For re-usability, moved http-headers -// to a seperate file. It can now be included by libraries/header.inc.php, +// For re-usability, moved http-headers +// to a separate file. It can now be included by libraries/header.inc.php, // querywindow.php.

require_once './libraries/header_http.inc.php'; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 13dbaf8..4f7b631 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -123,6 +123,7 @@ if ($tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_sc if (! (isset($db_is_information_schema) && $db_is_information_schema)) { $tabs['drop']['icon'] = 'b_deltbl.png'; $tabs['drop']['link'] = 'sql.php'; + $tabs['drop']['url_params'] = array('table' => NULL); $tabs['drop']['text'] = $strDrop; $tabs['drop']['args']['reload'] = 1; $tabs['drop']['args']['purge'] = 1; diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 30d4717..3688f2f 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -146,9 +146,9 @@ if ($cfgRelation['mimework'] && $cfg['BrowseMIME']) { . PMA_showHint($strMIME_transformation_options_note . $hint); }

-// garvin: workaround for field_fulltext, because its submitted indizes contain -// the index as a value, not a key. Inserted here for easier maintaineance -// and less code to change in existing files. +// workaround for field_fulltext, because its submitted indizes contain +// the index as a value, not a key. Inserted here for easier maintaineance +// and less code to change in existing files. if (isset($field_fulltext) && is_array($field_fulltext)) { foreach ($field_fulltext as $fulltext_nr => $fulltext_indexkey) { $submit_fulltext[$fulltext_indexkey] = $fulltext_indexkey; diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index bd34ae2..2d5b8e7 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -3,16 +3,16 @@ /** * handle field values (possibly uploaded from a file) * - * garvin: original if-clause checked, whether input was stored in a possible + * original if-clause checked, whether input was stored in a possible * fields_upload_XX var. Now check, if the field is set. If it is empty or a * malicious file, do not alter fields contents. If an empty or invalid file is * specified, the binary data gets deleter. Maybe a nice new text-variable is * appropriate to document this behaviour. * - * garvin: security cautions! You could trick the form and submit any file the + * security cautions! You could trick the form and submit any file the * webserver has access to for upload to a binary field. Shouldn't be that easy! ;) * - * garvin: default is to advance to the field-value parsing. Will only be set to + * default is to advance to the field-value parsing. Will only be set to * true when a binary file is uploaded, thus bypassing further manipulation of $val. * * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES @@ -93,7 +93,7 @@ if (false !== $possibly_uploaded_val) { // fields array, so we do not change the field value // but we can still handle field upload

- // garvin: when in UPDATE mode, do not alter field's contents. When in INSERT + // when in UPDATE mode, do not alter field's contents. When in INSERT // mode, insert empty field because no values were submitted. If protected // blobs where set, insert original fields content. if (! empty($prot_row[$me_fields_name[$key]])) { diff --git a/main.php b/main.php index 36a8125..8c65bc5 100644 --- a/main.php +++ b/main.php @@ -147,7 +147,6 @@ if (empty($cfg['Lang'])) { echo '</li>'; }

-// added by Michael Keck <mail_at_michaelkeck_dot_de> // ThemeManager if available

if ($GLOBALS['cfg']['ThemeManager']) { diff --git a/navigation.php b/navigation.php index 864456e..cb031ed 100644 --- a/navigation.php +++ b/navigation.php @@ -124,7 +124,7 @@ require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam();

/** - * garvin: For re-usability, moved http-headers to a seperate file. + * For re-usability, moved http-headers to a seperate file. * It can now be included by libraries/header.inc.php, querywindow.php. */ require_once './libraries/header_http.inc.php'; diff --git a/pdf_pages.php b/pdf_pages.php index aff7385..b7f93c5 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -332,7 +332,7 @@ while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) { $array_sh_page[] = $temp_sh_page; }

-// garvin: Display WYSIWYG-PDF parts? +// Display WYSIWYG-PDF parts? if ($cfg['WYSIWYG-PDF']) { if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) { $with_field_names = TRUE; diff --git a/po/nl.po b/po/nl.po index a00ecc7..e32c5e9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-19 00:28+0100\n" -"PO-Revision-Date: 2010-03-12 12:22+0200\n" -"Last-Translator: rink@initfour.nl\n" +"PO-Revision-Date: 2010-03-26 15:46+0200\n" +"Last-Translator: rink@initfour.nl\n" "Language-Team: dutch nl@li.org\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n"

@@ -37,7 +37,6 @@ msgstr ""

#. l10n: Language to use for MySQL 5.1 documentation #: libraries/common.lib.php:411 -#, fuzzy msgctxt "$mysql_5_1_doc_lang" msgid "en" msgstr "en" @@ -474,7 +473,6 @@ msgid "You are about to DISABLE a BLOB Repository!" msgstr "U staat op het punt om een BLOB Bewaarplaats UIT TE SCHAKELEN!"

#: libraries/messages.inc.php:99 -#, fuzzy msgctxt "$strBLOBRepositoryEnabled" msgid "Enabled" msgstr "Ingeschakeld" @@ -488,7 +486,6 @@ msgid "Remove BLOB Repository Reference" msgstr "Verwijder BLOB Bewaarplaats Referentie"

#: libraries/messages.inc.php:102 -#, fuzzy msgctxt "$strBLOBRepositoryRepair" msgid "Repair" msgstr "Repareer" diff --git a/sql.php b/sql.php index 4da90d1..864034c 100644 --- a/sql.php +++ b/sql.php @@ -302,7 +302,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { session_write_close(); }

- // garvin: Measure query time. + // Measure query time. // TODO-Item http://sourceforge.net/tracker/index.php?func=detail&aid=571934&grou... $querytime_before = array_sum(explode(' ', microtime()));

@@ -458,7 +458,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $unlim_num_rows = 0; } // end rows total count

- // garvin: if a table or database gets dropped, check column comments. + // if a table or database gets dropped, check column comments. if (isset($purge) && $purge == '1') { /** * Cleanup relations. @@ -470,11 +470,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { } elseif (strlen($db)) { PMA_relationsCleanupDatabase($db); } else { - // garvin: VOID. No DB/Table gets deleted. + // VOID. No DB/Table gets deleted. } // end if relation-stuff } // end if ($purge)

- // garvin: If a column gets dropped, do relation magic. + // If a column gets dropped, do relation magic. if (isset($cpurge) && $cpurge == '1' && isset($purgekey) && strlen($db) && strlen($table) && !empty($purgekey)) { require_once './libraries/relation_cleanup.lib.php'; diff --git a/tbl_addfield.php b/tbl_addfield.php index cfa25f5..c5d6ce9 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -166,11 +166,11 @@ if (isset($_REQUEST['do_save_data'])) { $result = PMA_DBI_try_query($sql_query);

if ($result === true) { - // garvin: If comments were sent, enable relation stuff + // If comments were sent, enable relation stuff require_once './libraries/relation.lib.php'; require_once './libraries/transformations.lib.php';

- // garvin: Update comment table for mime types [MIME] + // Update comment table for mime types [MIME] if (isset($_REQUEST['field_mimetype']) && is_array($_REQUEST['field_mimetype']) && $cfg['BrowseMIME']) { @@ -193,7 +193,7 @@ if (isset($_REQUEST['do_save_data'])) { require './tbl_structure.php'; } else { PMA_mysqlDie('', '', '', $err_url, false); - // garvin: An error happened while inserting/updating a table definition. + // An error happened while inserting/updating a table definition. // to prevent total loss of that data, we embed the form once again. // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php $num_fields = $_REQUEST['orig_num_fields']; diff --git a/tbl_alter.php b/tbl_alter.php index a399073..bd82396 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -139,7 +139,7 @@ if (isset($_REQUEST['do_save_data'])) { require './tbl_structure.php'; } else { PMA_mysqlDie('', '', '', $err_url, false); - // garvin: An error happened while inserting/updating a table definition. + // An error happened while inserting/updating a table definition. // to prevent total loss of that data, we embed the form once again. // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php if (isset($_REQUEST['orig_field'])) { diff --git a/tbl_change.php b/tbl_change.php index 0c89a17..263e4ab 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -507,7 +507,7 @@ foreach ($rows as $row_id => $vrow) { <?php $selected = '';

- // garvin: Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR' + // Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR' // or something similar. Then directly look up the entry in the RestrictFunctions array, // which will then reveal the available dropdown options if (isset($cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]) @@ -550,7 +550,7 @@ foreach ($rows as $row_id => $vrow) { $default_function = 'UNHEX'; } - // garvin: loop on the dropdown array and print all available options for that field. + // loop on the dropdown array and print all available options for that field. foreach ($dropdown as $each_dropdown){ echo '<option'; if ($default_function === $each_dropdown) { @@ -561,7 +561,7 @@ foreach ($rows as $row_id => $vrow) { $op_spacing_needed = TRUE; }

- // garvin: For compatibility's sake, do not let out all other functions. Instead + // For compatibility's sake, do not let out all other functions. Instead // print a separator (blank) and then show ALL functions which weren't shown // yet. $cnt_functions = count($cfg['Functions']); diff --git a/tbl_create.php b/tbl_create.php index 5fcecb7..b83955a 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -228,11 +228,11 @@ if (isset($_REQUEST['do_save_data'])) {

if ($result) {

- // garvin: If comments were sent, enable relation stuff + // If comments were sent, enable relation stuff require_once './libraries/relation.lib.php'; require_once './libraries/transformations.lib.php';

- // garvin: Update comment table for mime types [MIME] + // Update comment table for mime types [MIME] if (isset($_REQUEST['field_mimetype']) && is_array($_REQUEST['field_mimetype']) && $cfg['BrowseMIME']) { @@ -266,7 +266,7 @@ if (isset($_REQUEST['do_save_data'])) { exit; } else { PMA_mysqlDie('', '', '', $err_url, false); - // garvin: An error happened while inserting/updating a table definition. + // An error happened while inserting/updating a table definition. // to prevent total loss of that data, we embed the form once again. // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php $num_fields = $_REQUEST['orig_num_fields']; diff --git a/tbl_replace.php b/tbl_replace.php index 4e3e7ca..ef6973a 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -430,7 +430,8 @@ if (isset($return_to_sql_query)) { $GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'functions.js'; // in case we call sql.php which needs those: -$GLOBALS['js_include'][] = 'mootools-more.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js';

$active_page = $goto_include;

diff --git a/tbl_row_action.php b/tbl_row_action.php index efcc74d..5cc5033 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -79,7 +79,7 @@ require_once './libraries/header.inc.php'; if (!empty($submit_mult)) { switch($submit_mult) { case 'row_edit': - // garvin: As we got the fields to be edited from the + // As we got the fields to be edited from the // 'rows_to_delete' checkbox, we use the index of it as the // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script. @@ -96,7 +96,7 @@ if (!empty($submit_mult)) { // Needed to allow SQL export $single_table = TRUE;

- // garvin: As we got the fields to be edited from the + // As we got the fields to be edited from the // 'rows_to_delete' checkbox, we use the index of it as the // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script. diff --git a/tbl_structure.php b/tbl_structure.php index 01c12a5..0f3aae2 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -282,7 +282,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $field_charset = ''; }

- // garvin: Display basic mimetype [MIME] + // Display basic mimetype [MIME] if ($cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME'] && isset($mime_map[$row['Field']]['mimetype'])) { $type_mime = '<br />MIME: ' . str_replace('_', '/', $mime_map[$row['Field']]['mimetype']); } else { @@ -326,7 +326,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $field_name = htmlspecialchars($row['Field']); $displayed_field_name = $field_name;

- // garvin: underline commented fields and display a hover-title (CSS only) + // underline commented fields and display a hover-title (CSS only)

$comment_style = ''; if (isset($comments_map[$row['Field']])) { diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 011effe..a231d49 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -56,7 +56,7 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) { } }

-// garvin: For re-usability, moved http-headers and stylesheets +// For re-usability, moved http-headers and stylesheets // to a seperate file. It can now be included by libraries/header.inc.php, // querywindow.php.

hooks/post-receive