- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5242-g63b6abb
by Marc Delisle 30 Jun '10

30 Jun '10

The branch, master has been updated via 63b6abb326a5795850e9dfeb469873db38bc92a4 (commit) via b2fdf039db1ec34aea802b722bf5ce51b12c1f0b (commit) from 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 (commit) - Log ----------------------------------------------------------------- commit 63b6abb326a5795850e9dfeb469873db38bc92a4 Merge: 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 b2fdf039db1ec34aea802b722bf5ce51b12c1f0b Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 30 09:36:11 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: Documentation.html | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 460915a..3c12424 100644 --- a/Documentation.html +++ b/Documentation.html @@ -946,7 +946,8 @@ since this link provides funding for phpMyAdmin. table. To allow the usage of this functionality: <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in - <tt>$cfg['Servers'][$i]['table_info']</tt></li> + <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. + 'pma_table_info')</li> <li>then for each table where you want to use this feature, click "Structure/Relation view/Choose column to display" to choose the column.</li> @@ -1005,7 +1006,8 @@ since this link provides funding for phpMyAdmin. <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in - <tt>$cfg['Servers'][$i]['column_info']</tt></li> + <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. + 'pma_column_info')</li> <li>to update your PRE-2.5.0 Column_comments Table use this: <pre> @@ -1045,6 +1047,7 @@ ALTER TABLE `pma_column_comments` <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt> + (e.g. 'pma_history') </li> </ul> </dd> @@ -1075,7 +1078,7 @@ ALTER TABLE `pma_column_comments` <ul> <li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt></li> + <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li> </ul> </dd> @@ -1147,7 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> + <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords') </li> </ul> </dd> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-9-gb2fdf03
by Marc Delisle 30 Jun '10

30 Jun '10

The branch, QA_3_3 has been updated via b2fdf039db1ec34aea802b722bf5ce51b12c1f0b (commit) from 852ed51c27f35ec942440e0330318775d8e4c91d (commit) - Log ----------------------------------------------------------------- commit b2fdf039db1ec34aea802b722bf5ce51b12c1f0b Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 30 09:35:44 2010 -0400 clarify what is meant by "put the table name" ----------------------------------------------------------------------- Summary of changes: Documentation.html | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 6dff5d4..bd086d7 100644 --- a/Documentation.html +++ b/Documentation.html @@ -935,7 +935,8 @@ since this link provides funding for phpMyAdmin. table. To allow the usage of this functionality: <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in - <tt>$cfg['Servers'][$i]['table_info']</tt></li> + <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. + 'pma_table_info')</li> <li>then for each table where you want to use this feature, click "Structure/Relation view/Choose field to display" to choose the field.</li> @@ -994,7 +995,8 @@ since this link provides funding for phpMyAdmin. <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in - <tt>$cfg['Servers'][$i]['column_info']</tt></li> + <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. + 'pma_column_info')</li> <li>to update your PRE-2.5.0 Column_comments Table use this: <pre> @@ -1034,6 +1036,7 @@ ALTER TABLE `pma_column_comments` <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt> + (e.g. 'pma_history') </li> </ul> </dd> @@ -1064,7 +1067,7 @@ ALTER TABLE `pma_column_comments` <ul> <li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt></li> + <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li> </ul> </dd> @@ -1136,7 +1139,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> + <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords') </li> </ul> </dd> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5240-g0f9dfac
by Michal Čihař 30 Jun '10

30 Jun '10

The branch, master has been updated via 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 (commit) via 8178aac0186e2ca642764eaf3c204175f471fd34 (commit) from 116d1297afb96638650649a644cf59d4774dd66b (commit) - Log ----------------------------------------------------------------- commit 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 29 22:42:58 2010 +0200 Translation update done using Pootle. commit 8178aac0186e2ca642764eaf3c204175f471fd34 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 29 22:42:42 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index e47e1c2..4cbdd2e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-13 09:03-0400\n" -"PO-Revision-Date: 2010-06-17 01:10+0200\n" +"PO-Revision-Date: 2010-06-29 22:42+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" @@ -193,7 +193,7 @@ msgstr "Natisni" #: db_export.php:29 msgid "View dump (schema) of database" -msgstr "Preglej povzetek stanja podatkovne baze" +msgstr "Preglej povzetek stanja podatkovne zbirke" #: db_export.php:33 db_printview.php:96 db_qbe.php:102 db_structure.php:51 #: db_tracking.php:35 export.php:359 navigation.php:332 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5238-g116d129
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, master has been updated via 116d1297afb96638650649a644cf59d4774dd66b (commit) via 852ed51c27f35ec942440e0330318775d8e4c91d (commit) via f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff (commit) from f368184a12c2fc619ef442e588e07be58c3c6085 (commit) - Log ----------------------------------------------------------------- commit 116d1297afb96638650649a644cf59d4774dd66b Merge: f368184a12c2fc619ef442e588e07be58c3c6085 852ed51c27f35ec942440e0330318775d8e4c91d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 08:23:47 2010 -0400 solve merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/replication_gui.lib.php | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7772727..f8f0df5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ $Id$ databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible +- bug [replication] Do not offer information_schema in the list of databases 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index db41b20..a975bee 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -20,6 +20,9 @@ function PMA_replication_db_multibox() $multi_values .= '<select name="db_select[]" size="6" multiple="multiple" id="db_select">'; foreach ($GLOBALS['pma']->databases as $current_db) { + if ('information_schema' == $current_db) { + continue; + } if (! empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) { $is_selected = ' selected="selected"'; } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-8-g852ed51
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, QA_3_3 has been updated via 852ed51c27f35ec942440e0330318775d8e4c91d (commit) from f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff (commit) - Log ----------------------------------------------------------------- commit 852ed51c27f35ec942440e0330318775d8e4c91d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 08:14:31 2010 -0400 bug [replication] Do not offer information_schema in the list of databases ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/replication_gui.lib.php | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cdba96..66873fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible +- bug [replication] Do not offer information_schema in the list of databases 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index d772800..b5f14ad 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -72,6 +72,9 @@ function PMA_replication_db_multibox() $multi_values .= '<select name="db_select[]" size="6" multiple="multiple" id="db_select">'; foreach ($GLOBALS['pma']->databases as $current_db) { + if ('information_schema' == $current_db) { + continue; + } if (! empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) { $is_selected = ' selected="selected"'; } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5235-gf368184
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, master has been updated via f368184a12c2fc619ef442e588e07be58c3c6085 (commit) from 90ac3d39a03235593b0952864bfd1e14139cc37c (commit) - Log ----------------------------------------------------------------- commit f368184a12c2fc619ef442e588e07be58c3c6085 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 07:57:45 2010 -0400 fix typo; remove Id ----------------------------------------------------------------------- Summary of changes: libraries/display_import.lib.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 318dd34..dd9f650 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -94,7 +93,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { window.setTimeout(perform_upload, 1000); <?php -} else { // no plugin avaliable +} else { // no plugin available ?> $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>'); $('#upload_form_status').css("display", "none"); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5234-g90ac3d3
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, master has been updated via 90ac3d39a03235593b0952864bfd1e14139cc37c (commit) from 16ed06531a00ebac5bd33b40fbdb8139639f726c (commit) - Log ----------------------------------------------------------------- commit 90ac3d39a03235593b0952864bfd1e14139cc37c Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 07:56:10 2010 -0400 bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/display_import.lib.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7492e73..7772727 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,8 @@ $Id$ 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker +- bug #3022705 [import] Import button does not work in Catalan when there + is no progress bar possible 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 923d962..318dd34 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -96,7 +96,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <?php } else { // no plugin avaliable ?> - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo __('Please be patient, the file is being uploaded. Details about the upload are not available.') . PMA_showDocu('faq2_9'); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>'); $('#upload_form_status').css("display", "none"); <?php } // else hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-7-gf463b1c
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, QA_3_3 has been updated via f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff (commit) from f70bd16ce3e34877c6c07087b649ad3b5241e0c0 (commit) - Log ----------------------------------------------------------------- commit f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 07:48:28 2010 -0400 bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/display_import.lib.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1840c48..7cdba96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker +- bug #3022705 [import] Import button does not work in Catalan when there + is no progress bar possible 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 4d40692..b5eab10 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -98,7 +98,7 @@ window.addEvent('domready', function() { <?php } else { ?> - $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportUploadInfoNotAvailable . PMA_showDocu('faq2_9'); ?>'); + $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat($strImportUploadInfoNotAvailable) . PMA_showDocu('faq2_9'); ?>'); $('upload_form_status').setStyle("display", "none"); <?php } // else hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5233-g16ed065
by Dieter Adriaenssens 28 Jun '10

28 Jun '10

The branch, master has been updated via 16ed06531a00ebac5bd33b40fbdb8139639f726c (commit) from 4986ee01742944b1c648cdcac0360cff653c12f8 (commit) - Log ----------------------------------------------------------------- commit 16ed06531a00ebac5bd33b40fbdb8139639f726c Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Mon Jun 28 20:36:12 2010 +0200 remove author names ----------------------------------------------------------------------- Summary of changes: libraries/auth/cookie.auth.lib.php | 2 -- libraries/auth/swekey/swekey.php | 2 +- libraries/export/sql.php | 2 +- libraries/ob.lib.php | 2 -- libraries/relation.lib.php | 1 - scripts/convertcfg.pl | 3 --- tbl_change.php | 3 --- tbl_printview.php | 3 +-- tbl_select.php | 2 -- 9 files changed, 3 insertions(+), 17 deletions(-) diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index d2e16ec..d524e1c 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -2,8 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Set of functions used to run cookie based authentication. - * Thanks to Piotr Roszatycki <d3xter at users.sourceforge.net> and - * Dan Wilson who built this patch for the Debian package. * * @package phpMyAdmin-Auth-Cookie * @version $Id$ diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php index 66ce350..3e91e23 100644 --- a/libraries/auth/swekey/swekey.php +++ b/libraries/auth/swekey/swekey.php @@ -390,7 +390,7 @@ function Swekey_GetFastHalfRndToken() $_SESSION['rnd-token-date'] = time(); if (! empty($cachefile)) { - // we unlink the file so no possible tempfile race attack (thanks Thijs) + // we unlink the file so no possible tempfile race attack unlink($cachefile); $file = fopen($cachefile , "x"); if ($file != FALSE) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 4c42a91..c2f68bc 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -535,7 +535,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a $schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table, $sql_backquotes) . ';' . $crlf; } - // Steve Alberty's patch for complete table dump, + // Complete table dump, // Whether to quote table and fields names or not if ($sql_backquotes) { PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 1'); diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php index 180c463..2290324 100644 --- a/libraries/ob.lib.php +++ b/libraries/ob.lib.php @@ -41,8 +41,6 @@ function PMA_outBufferModeGet() // any right frame file in phpMyAdmin will not be handled properly by // the browser. My fix was to check the ini file within the // PMA_outBufferModeGet() function. - // - // (Patch by Garth Gillespie, modified by Marc Delisle) $mode = 0; } elseif (function_exists('ob_get_level') && ob_get_level() > 0) { // If output buffering is enabled in php.ini it's not possible to diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 587a67e..6aefe89 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -965,7 +965,6 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, /** * Gets foreign keys in preparation for a drop-down selector - * Thanks to <markus(a)noga.de> * * @uses PMA_Table::countRecords() * @uses PMA_backquote() diff --git a/scripts/convertcfg.pl b/scripts/convertcfg.pl index 1b636a1..14c0709 100755 --- a/scripts/convertcfg.pl +++ b/scripts/convertcfg.pl @@ -7,9 +7,6 @@ # # Takes input from STDIN, sends output to STDOUT # -# By Robin Johnson robbat2(a)users.sourceforge.net -# Many thanks to Patrick Lougheed pat(a)tfsb.org -# while(<>) { s/\$cfg(\w+)/\$cfg\[\'$1\'\]/g; diff --git a/tbl_change.php b/tbl_change.php index 7e32e9b..051b1fc 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -197,7 +197,6 @@ if (isset($where_clause)) { $rows = array_fill(0, $cfg['InsertRows'], false); } -// <markus(a)noga.de> // retrieve keys into foreign fields, if any $foreigners = PMA_getForeigners($db, $table); @@ -507,7 +506,6 @@ foreach ($rows as $row_id => $vrow) { // The function column // ------------------- - // Change by Bernard M. Piller <bernard(a)bmpsystems.com> // We don't want binary data to be destroyed // Note: from the MySQL manual: "BINARY doesn't affect how the column is // stored or retrieved" so it does not mean that the contents is @@ -831,7 +829,6 @@ foreach ($rows as $row_id => $vrow) { </select> <?php } - // Change by Bernard M. Piller <bernard(a)bmpsystems.com> // We don't want binary data destroyed elseif ($field['is_binary'] || $field['is_blob']) { if (($cfg['ProtectBinary'] && $field['is_blob']) diff --git a/tbl_printview.php b/tbl_printview.php index 88c9a6b..7f7a8c8 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -53,8 +53,7 @@ PMA_DBI_select_db($db); /** - * Multi-tables printview thanks to Christophe Gesche from the "MySQL Form - * Generator for PHPMyAdmin" (http://sourceforge.net/projects/phpmysqlformgen/) + * Multi-tables printview */ if (isset($selected_tbl) && is_array($selected_tbl)) { $the_tables = $selected_tbl; diff --git a/tbl_select.php b/tbl_select.php index e965c50..99936f3 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -95,7 +95,6 @@ if (!isset($param) || $param[0] == '') { PMA_DBI_free_result($result); unset($result, $type); - // <markus(a)noga.de> // retrieve keys into foreign fields, if any // check also foreigners even if relwork is FALSE (to get // foreign keys from innodb) @@ -183,7 +182,6 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) { </td> <td> <?php - // <markus(a)noga.de> $field = $fields_list[$i]; $foreignData = PMA_getForeignData($foreigners, $field, false, '', ''); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5232-g4986ee0
by Marc Delisle 28 Jun '10

28 Jun '10

The branch, master has been updated via 4986ee01742944b1c648cdcac0360cff653c12f8 (commit) from 1d8d6b32ef71f6a7e835861223ef49d73ee89bb6 (commit) - Log ----------------------------------------------------------------- commit 4986ee01742944b1c648cdcac0360cff653c12f8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 28 09:25:45 2010 -0400 lang directory no longer exists; I guess this mechanism is no longer needed ----------------------------------------------------------------------- Summary of changes: libraries/common.inc.php | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 710ecdf..5366c18 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -564,13 +564,6 @@ $GLOBALS['footnotes'] = array(); /* loading language file LABEL_loading_language_file */ /** - * Added messages while developing: - */ -if (file_exists('./lang/added_messages.php')) { - include './lang/added_messages.php'; -} - -/** * lang detection is done here */ require_once './libraries/select_lang.lib.php'; hooks/post-receive -- phpMyAdmin

1 0