From 7d26b2074fe83bde7cbebf986e23f85e0c28f55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jere=20Vainionp=C3=A4=C3=A4?= Date: Sat, 8 Dec 2012 10:55:34 +0100 Subject: [PATCH 01/85] Translated using Weblate (Finnish) Currently translated at 74.2% (1902 of 2562) --- po/fi.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index fbd044fbe7..6bd32dabf2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-12-07 17:38+0200\n" -"Last-Translator: Ilkka Kiviharju \n" +"PO-Revision-Date: 2012-12-08 10:55+0200\n" +"Last-Translator: Jere Vainionpää \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -8538,7 +8538,7 @@ msgstr "Tietokanta käyttäjälle" #: main.php:172 msgid "Software" -msgstr "" +msgstr "Ohjelmisto" #: main.php:173 #, fuzzy From f08295b3bcad431cff900e27743298c42ac7b719 Mon Sep 17 00:00:00 2001 From: Emil Hemdal Date: Mon, 10 Dec 2012 16:38:59 +0100 Subject: [PATCH 02/85] Translated using Weblate (Swedish) Currently translated at 99.5% (2597 of 2610) --- po/sv.po | 137 ++++++++++++++++++++++--------------------------------- 1 file changed, 54 insertions(+), 83 deletions(-) diff --git a/po/sv.po b/po/sv.po index fdf89b4624..97e9b85f73 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-09 07:12-0500\n" -"PO-Revision-Date: 2012-12-03 11:17+0200\n" -"Last-Translator: Anders Jonsson \n" -"Language-Team: Swedish \n" +"PO-Revision-Date: 2012-12-10 16:38+0200\n" +"Last-Translator: Emil Hemdal \n" +"Language-Team: Swedish " +"\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Weblate 1.4-dev\n" @@ -2763,7 +2763,7 @@ msgstr "Öppna nytt phpMyAdmin-fönster" #: libraries/Header.class.php:385 msgid "Click on the bar to scroll to top of page" -msgstr "" +msgstr "Klicka på bommen för att förflytta dig till toppen av sidan" #: libraries/Header.class.php:591 #: libraries/plugins/auth/AuthenticationCookie.class.php:259 @@ -3777,7 +3777,7 @@ msgstr "Du bör uppgradera till %s %s eller senare." #: libraries/common.inc.php:1039 msgid "Error: Token mismatch" -msgstr "" +msgstr "Fel: Token matchningsfel" #: libraries/common.inc.php:1083 msgid "GLOBALS overwrite attempt" @@ -4560,16 +4560,14 @@ msgid "Databases display options" msgstr "Visningsalternativ för databaser" #: libraries/config/messages.inc.php:179 setup/frames/menu.inc.php:19 -#, fuzzy #| msgid "Navigation frame" msgid "Navigation panel" -msgstr "Navigeringsram" +msgstr "Navigationspanel" #: libraries/config/messages.inc.php:180 -#, fuzzy #| msgid "Customize appearance of the navigation frame" msgid "Customize appearance of the navigation panel" -msgstr "Anpassa navigeringsramens utseende" +msgstr "Anpassa navigationspanelens utseende" #: libraries/config/messages.inc.php:181 libraries/select_server.lib.php:42 #: setup/frames/index.inc.php:117 @@ -4585,10 +4583,9 @@ msgid "Tables display options" msgstr "Visningsalternativ för tabeller" #: libraries/config/messages.inc.php:185 setup/frames/menu.inc.php:20 -#, fuzzy #| msgid "Main frame" msgid "Main panel" -msgstr "Huvudram" +msgstr "Huvudpanelen" #: libraries/config/messages.inc.php:186 msgid "Microsoft Office" @@ -4701,16 +4698,14 @@ msgid "Customize import defaults" msgstr "Anpassa standardvärden för import" #: libraries/config/messages.inc.php:211 -#, fuzzy #| msgid "Customize navigation frame" msgid "Customize navigation panel" -msgstr "Anpassa navigeringsram" +msgstr "Anpassa navigeringspanelen" #: libraries/config/messages.inc.php:212 -#, fuzzy #| msgid "Customize main frame" msgid "Customize main panel" -msgstr "Anpassa huvudram" +msgstr "Anpassa huvudpanelen" #: libraries/config/messages.inc.php:213 libraries/config/messages.inc.php:218 #: setup/frames/menu.inc.php:18 @@ -5053,20 +5048,18 @@ msgid "Memory limit" msgstr "Minnesgräns" #: libraries/config/messages.inc.php:299 -#, fuzzy #| msgid "Show logo in left frame" msgid "Show logo in navigation panel" -msgstr "Visa logo i vänster ram" +msgstr "Visa logotypen i navigeringspanelen" #: libraries/config/messages.inc.php:300 msgid "Display logo" msgstr "Visa logo" #: libraries/config/messages.inc.php:301 -#, fuzzy #| msgid "URL where logo in the navigation frame will point to" msgid "URL where logo in the navigation panel will point to" -msgstr "URL där logotyp i navigeringsramen kommer att peka till" +msgstr "URL som navigationspanelens logotyp pekar mot" #: libraries/config/messages.inc.php:302 msgid "Logo link URL" @@ -5085,10 +5078,9 @@ msgid "Logo link target" msgstr "Logo-länk mål" #: libraries/config/messages.inc.php:305 -#, fuzzy #| msgid "Display server choice at the top of the left frame" msgid "Display server choice at the top of the navigation panel" -msgstr "Visa val av server högst upp i vänstra ramen" +msgstr "Visa val av server högst upp i navigationspanelen" #: libraries/config/messages.inc.php:306 msgid "Display servers selection" @@ -5099,25 +5091,24 @@ msgid "Target for quick access icon" msgstr "Mål för snabbåtkomst-ikon" #: libraries/config/messages.inc.php:308 -#, fuzzy #| msgid "Minimum number of tables to display the table filter box" msgid "" "Defines the minimum number of items (tables, views, routines and events) to " "display a filter box." -msgstr "Minsta antal tabeller för att visa tabellen filter box" +msgstr "" +"Definierar minsta antal objekt (tabeller, vyer, rutiner och händelser) för " +"att visa filterboxen." #: libraries/config/messages.inc.php:309 -#, fuzzy #| msgid "Minimum number of tables to display the table filter box" msgid "Minimum number of items to display the filter box" -msgstr "Minsta antal tabeller för att visa tabellen filter box" +msgstr "Minsta antal objekt för att visa filterboxen" #: libraries/config/messages.inc.php:310 msgid "Minimum number of databases to display the database filter box" msgstr "Minsta antal databaser för att visa databasens filter box" #: libraries/config/messages.inc.php:311 -#, fuzzy #| msgid "" #| "Only light version; display databases in a tree (determined by the " #| "separator defined below)" @@ -5125,12 +5116,12 @@ msgid "" "Group items in the navigation tree (determined by the separator defined " "below)" msgstr "" -"Endast lätt version; visa databaser i ett träd (bestämt av avskiljaren " -"definierad nedan)" +"Grupperar objekt i navigationsträdet (bestäms av avskiljaren definierad " +"nedan)" #: libraries/config/messages.inc.php:312 msgid "Group items in the tree" -msgstr "" +msgstr "Grupperar objekt i trädet" #: libraries/config/messages.inc.php:313 msgid "String that separates databases into different tree levels" @@ -5243,8 +5234,8 @@ msgid "" "Disable the default warning that is displayed if a difference between the " "MySQL library and server is detected" msgstr "" -"Inaktivera standardvarning vilken visas om mcrypt saknas för cookie " -"autentisering" +"Inaktivera standardvarningen som visas när en skillnad mellan MySQL " +"biblioteket och servern är upptäckt" #: libraries/config/messages.inc.php:337 msgid "Server/library difference warning" @@ -5340,10 +5331,9 @@ msgid "Grid editing: trigger action" msgstr "" #: libraries/config/messages.inc.php:361 -#, fuzzy #| msgid "Save all edited cells at once" msgid "Grid editing: save all edited cells at once" -msgstr "Spara alla redigerade celler omedelbart" +msgstr "Rutnäts-redigering: spara alla redigerade celler omedelbart" #: libraries/config/messages.inc.php:362 msgid "Directory where exports can be saved on server" @@ -5408,7 +5398,6 @@ msgid "Authentication type" msgstr "Autentiseringstyp" #: libraries/config/messages.inc.php:376 -#, fuzzy #| msgid "" #| "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/" #| "a] support, suggested: [kbd]pma_bookmark[/kbd]" @@ -5416,15 +5405,15 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] " "support, suggested: [kbd]pma__bookmark[/kbd]" msgstr "" -"Lämna tomt för inget stöd för [a@http://wiki.phpmyadmin.net/pma/bookmark]" -"bokmärken[/a], förslag: [kbd]pma_bookmark[/kbd]" +"Lämna tomt för att stänga av " +"[a@http://wiki.phpmyadmin.net/pma/bookmark]bokmärken[/a], förslag: " +"[kbd]pma_bookmark[/kbd]" #: libraries/config/messages.inc.php:377 msgid "Bookmark table" msgstr "Tabell för bokmärken" #: libraries/config/messages.inc.php:378 -#, fuzzy #| msgid "" #| "Leave blank for no column comments/mime types, suggested: [kbd]" #| "pma_column_info[/kbd]" @@ -5432,8 +5421,8 @@ msgid "" "Leave blank for no column comments/mime types, suggested: [kbd]" "pma__column_info[/kbd]" msgstr "" -"Lämna tomt för inget stöd för kolumnkommentarer/mime-typer, förslag: [kbd]" -"pma_column_info[/kbd]" +"Lämna tomt för att stänga av kolumnkommentarer/mime-typer, förslag: " +"[kbd]pma_column_info[/kbd]" #: libraries/config/messages.inc.php:379 msgid "Column information table" @@ -5493,7 +5482,6 @@ msgid "Count tables" msgstr "Räkna tabeller" #: libraries/config/messages.inc.php:391 -#, fuzzy #| msgid "" #| "Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/" #| "kbd]" @@ -5501,8 +5489,8 @@ msgid "" "Leave blank for no Designer support, suggested: [kbd]pma__designer_coords[/" "kbd]" msgstr "" -"Lämna tomt för inget stöd för Designer, förslag: [kbd]pma_designer_coords[/" -"kbd]" +"Lämna tomt för avstängt Designer stöd, förslag: " +"[kbd]pma_designer_coords[/kbd]" #: libraries/config/messages.inc.php:392 msgid "Designer table" @@ -5538,7 +5526,6 @@ msgid "Hide databases" msgstr "Dölj databaser" #: libraries/config/messages.inc.php:399 -#, fuzzy #| msgid "" #| "Leave blank for no SQL query history support, suggested: [kbd]pma_history" #| "[/kbd]" @@ -5546,8 +5533,8 @@ msgid "" "Leave blank for no SQL query history support, suggested: [kbd]pma__history[/" "kbd]" msgstr "" -"Lämna blankt för inget stöd för SQL-frågehistorik, förslag: [kbd]pma_history" -"[/kbd]" +"Lämna blankt för att stänga av SQL-frågehistoriks stöd, förslag: " +"[kbd]pma_history[/kbd]" #: libraries/config/messages.inc.php:400 msgid "SQL query history table" @@ -5612,13 +5599,13 @@ msgid "Password for config auth" msgstr "Löseenord för config auth" #: libraries/config/messages.inc.php:412 -#, fuzzy #| msgid "" #| "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]" msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/kbd]" msgstr "" -"Lämna blankt för inget stöd för PDF-schema, förslag: [kbd]pma_pdf_pages[/kbd]" +"Lämna blankt för att stänga av stöd för PDF-schema, förslag: " +"[kbd]pma_pdf_pages[/kbd]" #: libraries/config/messages.inc.php:413 msgid "PDF schema: pages table" @@ -5647,7 +5634,6 @@ msgid "Server port" msgstr "Serverport" #: libraries/config/messages.inc.php:418 -#, fuzzy #| msgid "" #| "Leave blank for no \"persistent\" recently used tables across sessions, " #| "suggested: [kbd]pma_recent[/kbd]" @@ -5655,15 +5641,14 @@ msgid "" "Leave blank for no \"persistent\" recently used tables across sessions, " "suggested: [kbd]pma__recent[/kbd]" msgstr "" -"Lämna tomt för iatt inte spara nyligen använda användarinställningar " -"tabeller för alla sessioner i databasen, förslag: [kbd]pma_config[/kbd]" +"Lämna tomt för att stänga av \"ihållande\" nyligen använda tabeller över " +"sessioner, förslag: [kbd]pma__recent[/kbd]" #: libraries/config/messages.inc.php:419 msgid "Recently used table" msgstr "Nyligen använd tabell" #: libraries/config/messages.inc.php:420 -#, fuzzy #| msgid "" #| "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-" #| "links[/a] support, suggested: [kbd]pma_relation[/kbd]" @@ -5671,8 +5656,9 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links" "[/a] support, suggested: [kbd]pma__relation[/kbd]" msgstr "" -"Lämna tomt för inget stöd för [a@http://wiki.phpmyadmin.net/pma/relation]" -"relationslänkar[/a], förslag: [kbd]pma_relation[/kbd]" +"Lämna tomt för avstängt stöd för " +"[a@http://wiki.phpmyadmin.net/pma/relation]relationslänkar[/a], förslag: " +"[kbd]pma_relation[/kbd]" #: libraries/config/messages.inc.php:421 msgid "Relation table" @@ -5719,7 +5705,6 @@ msgid "Use SSL" msgstr "Använd SSL" #: libraries/config/messages.inc.php:431 -#, fuzzy #| msgid "" #| "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/" #| "kbd]" @@ -5727,8 +5712,8 @@ msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma__table_coords[/" "kbd]" msgstr "" -"Lämna tomt för inget stöd för PDF-schema, förslag: [kbd]pma_table_coords[/" -"kbd]" +"Lämna tomt för avstängt stöd för PDF-schema, förslag: " +"[kbd]pma_table_coords[/kbd]" #: libraries/config/messages.inc.php:432 msgid "PDF schema: table coordinates" @@ -5743,8 +5728,8 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma__table_info[/kbd]" msgstr "" -"Tabell för att beskriva fält att visa, lämna tomt för inget stöd; förslag: " -"[kbd]pma_table_info[/kbd]" +"Tabell för att beskriva visnings kolumnerna, lämna tomt för avstängt stöd; " +"förslag: [kbd]pma_table_info[/kbd]" #: libraries/config/messages.inc.php:434 msgid "Display columns table" @@ -5759,8 +5744,8 @@ msgid "" "Leave blank for no \"persistent\" tables'UI preferences across sessions, " "suggested: [kbd]pma__table_uiprefs[/kbd]" msgstr "" -"Lämna tomt för iatt inte spara nyligen använda användarinställningstabeller " -"för alla sessioner, förslag: [kbd]pma_config[/kbd]" +"Lämna tomt för att stänga av \"ihållande\" tabellers' UI preferenser som " +"sparas över sessioner, förslag: [kbd]pma_config[/kbd]" #: libraries/config/messages.inc.php:436 msgid "UI preferences table" @@ -5821,8 +5806,8 @@ msgid "" "Leave blank for no SQL query tracking support, suggested: [kbd]pma__tracking" "[/kbd]" msgstr "" -"Lämna tomt för inget stöd för SQL-frågehistorik, förslag: [kbd]pma_history[/" -"kbd]" +"Lämna tomt för avstängt stöd för SQL-förfrågnings spårning, förslag: " +"[kbd]pma_history[/kbd]" #: libraries/config/messages.inc.php:446 msgid "SQL query tracking table" @@ -5841,7 +5826,6 @@ msgid "Automatically create versions" msgstr "Automatiskt skapa versioner" #: libraries/config/messages.inc.php:449 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma_userconfig[/kbd]" @@ -5849,7 +5833,7 @@ msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma__userconfig[/kbd]" msgstr "" -"Lämna tomt för att inga användarinställningar ska lagras i databasen, " +"Lämna tomt för att stänga av lagring av användarpreferenser i databasen, " "förslag: [kbd]pma_userconfig[/kbd]" #: libraries/config/messages.inc.php:450 @@ -7400,23 +7384,20 @@ msgstr[0] "" msgstr[1] "" #: libraries/navigation/NavigationTree.class.php:1025 -#, fuzzy #| msgid "Filter databases by name" msgid "filter databases by name" -msgstr "Filtrera databaser efter namn" +msgstr "filtrera databaser efter namn" #: libraries/navigation/NavigationTree.class.php:1026 #: libraries/navigation/NavigationTree.class.php:1052 -#, fuzzy #| msgid "Clear series" msgid "Clear Fast Filter" -msgstr "Rensa serie" +msgstr "Rensa snabbfilter" #: libraries/navigation/NavigationTree.class.php:1051 -#, fuzzy #| msgid "Filter tables by name" msgid "filter items by name" -msgstr "Filtrera tabeller efter namn" +msgstr "filtrera tabeller efter namn" #. l10n: The word "Node" must not be translated here #: libraries/navigation/NodeFactory.class.php:40 @@ -7435,14 +7416,12 @@ msgid "Columns" msgstr "Kolumn" #: libraries/navigation/Nodes/Node_Column_Container.class.php:38 -#, fuzzy #| msgid "New" msgctxt "Create new column" msgid "New" msgstr "Ny" #: libraries/navigation/Nodes/Node_Event_Container.class.php:36 -#, fuzzy #| msgid "New" msgctxt "Create new event" msgid "New" @@ -7455,14 +7434,12 @@ msgid "Functions" msgstr "Funktioner" #: libraries/navigation/Nodes/Node_Function_Container.class.php:36 -#, fuzzy #| msgid "New" msgctxt "Create new function" msgid "New" msgstr "Ny" #: libraries/navigation/Nodes/Node_Index_Container.class.php:38 -#, fuzzy #| msgid "New" msgctxt "Create new index" msgid "New" @@ -7476,21 +7453,18 @@ msgstr "Procedurer" #: libraries/navigation/Nodes/Node_Procedure_Container.class.php:36 #: libraries/rte/rte_footer.lib.php:29 -#, fuzzy #| msgid "New" msgctxt "Create new procedure" msgid "New" msgstr "Ny" #: libraries/navigation/Nodes/Node_Table_Container.class.php:40 -#, fuzzy #| msgid "New" msgctxt "Create new table" msgid "New" msgstr "Ny" #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:36 -#, fuzzy #| msgid "New" msgctxt "Create new trigger" msgid "New" @@ -7502,7 +7476,6 @@ msgid "Views" msgstr "Vy" #: libraries/navigation/Nodes/Node_View_Container.class.php:36 -#, fuzzy #| msgid "New" msgctxt "Create new view" msgid "New" @@ -9446,7 +9419,6 @@ msgid "User has been added." msgstr "En användare har skapats." #: libraries/server_privileges.lib.php:1625 -#, fuzzy #| msgid "New" msgctxt "Create new user" msgid "New" @@ -12121,10 +12093,9 @@ msgid "The columns have been moved successfully." msgstr "Kolumnerna har flyttats framgångsrikt." #: tbl_chart.php:41 -#, fuzzy #| msgid "No data found" msgid "No data to display" -msgstr "Inga data hittades" +msgstr "Ingen data att visa" #: tbl_chart.php:130 msgctxt "Chart type" From 7ff92fd6a7c34d74943ee639cf5346b96ae001c3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 10 Dec 2012 13:01:54 -0500 Subject: [PATCH 03/85] Bug #3591442 Fatal error when dropping table --- libraries/Util.class.php | 57 ++++++++++++++++++++++++++++++++++++ libraries/db_info.inc.php | 61 +++------------------------------------ 2 files changed, 61 insertions(+), 57 deletions(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 300183bb37..4eaabf875c 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -4064,5 +4064,62 @@ class PMA_Util return $values; } + + /** + * fills given tooltip arrays + * + * @param array &$tooltip_truename tooltip data + * @param array &$tooltip_aliasname tooltip data + * @param array $table tabledata + * + * @return void + */ + public static function PMA_fillTooltip( + &$tooltip_truename, &$tooltip_aliasname, $table) + { + if (strstr($table['Comment'], '; InnoDB free') === false) { + if (!strstr($table['Comment'], 'InnoDB free') === false) { + // here we have just InnoDB generated part + $table['Comment'] = ''; + } + } else { + // remove InnoDB comment from end, just the minimal part + // (*? is non greedy) + $table['Comment'] = preg_replace( + '@; InnoDB free:.*?$@', '', $table['Comment'] + ); + } + // views have VIEW as comment so it's not a real comment put by a user + if ('VIEW' == $table['Comment']) { + $table['Comment'] = ''; + } + if (empty($table['Comment'])) { + $table['Comment'] = $table['Name']; + } else { + // todo: why? + $table['Comment'] .= ' '; + } + + $tooltip_truename[$table['Name']] = $table['Name']; + $tooltip_aliasname[$table['Name']] = $table['Comment']; + + if (isset($table['Create_time']) && !empty($table['Create_time'])) { + $tooltip_aliasname[$table['Name']] .= ', ' . __('Creation') + . ': ' + . PMA_Util::localisedDate(strtotime($table['Create_time'])); + } + + if (! empty($table['Update_time'])) { + $tooltip_aliasname[$table['Name']] .= ', ' . __('Last update') + . ': ' + . PMA_Util::localisedDate(strtotime($table['Update_time'])); + } + + if (! empty($table['Check_time'])) { + $tooltip_aliasname[$table['Name']] .= ', ' . __('Last check') + . ': ' + . PMA_Util::localisedDate(strtotime($table['Check_time'])); + } + } } ?> diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 3561e8e8df..6ddf88aacd 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -29,61 +29,6 @@ if (isset($_REQUEST['pos'])) { } $pos = $_SESSION['tmp_user_values']['table_limit_offset']; -/** - * fills given tooltip arrays - * - * @param array &$tooltip_truename tooltip data - * @param array &$tooltip_aliasname tooltip data - * @param array $table tabledata - * - * @return void - */ -function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) -{ - if (strstr($table['Comment'], '; InnoDB free') === false) { - if (!strstr($table['Comment'], 'InnoDB free') === false) { - // here we have just InnoDB generated part - $table['Comment'] = ''; - } - } else { - // remove InnoDB comment from end, just the minimal part (*? is non greedy) - $table['Comment'] = preg_replace( - '@; InnoDB free:.*?$@', '', $table['Comment'] - ); - } - // views have VIEW as comment so it's not a real comment put by a user - if ('VIEW' == $table['Comment']) { - $table['Comment'] = ''; - } - if (empty($table['Comment'])) { - $table['Comment'] = $table['Name']; - } else { - // why? - $table['Comment'] .= ' '; - } - - $tooltip_truename[$table['Name']] = $table['Name']; - $tooltip_aliasname[$table['Name']] = $table['Comment']; - - if (isset($table['Create_time']) && !empty($table['Create_time'])) { - $tooltip_aliasname[$table['Name']] .= ', ' . __('Creation') - . ': ' - . PMA_Util::localisedDate(strtotime($table['Create_time'])); - } - - if (! empty($table['Update_time'])) { - $tooltip_aliasname[$table['Name']] .= ', ' . __('Last update') - . ': ' - . PMA_Util::localisedDate(strtotime($table['Update_time'])); - } - - if (! empty($table['Check_time'])) { - $tooltip_aliasname[$table['Name']] .= ', ' . __('Last check') - . ': ' - . PMA_Util::localisedDate(strtotime($table['Check_time'])); - } -} - PMA_Util::checkParameters(array('db')); /** @@ -164,7 +109,7 @@ if (true === $cfg['SkipLockedTables']) { } if ($cfg['ShowTooltip']) { - PMA_fillTooltip( + PMA_Util::PMA_fillTooltip( $tooltip_truename, $tooltip_aliasname, $sts_tmp ); } @@ -250,7 +195,9 @@ if (! isset($sot_ready)) { if ($cfg['ShowTooltip']) { foreach ($tables as $each_table) { - PMA_fillTooltip($tooltip_truename, $tooltip_aliasname, $each_table); + PMA_Util::PMA_fillTooltip( + $tooltip_truename, $tooltip_aliasname, $each_table + ); } } } From b0a6275f8718095c146f4422119c5daeacc5d1a9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 10 Dec 2012 14:25:54 -0500 Subject: [PATCH 04/85] Remove redundant PMA_ prefix --- libraries/Util.class.php | 2 +- libraries/db_info.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 4eaabf875c..5287386b35 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -4074,7 +4074,7 @@ class PMA_Util * * @return void */ - public static function PMA_fillTooltip( + public static function fillTooltip( &$tooltip_truename, &$tooltip_aliasname, $table) { if (strstr($table['Comment'], '; InnoDB free') === false) { diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 6ddf88aacd..e77da9e681 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -109,7 +109,7 @@ if (true === $cfg['SkipLockedTables']) { } if ($cfg['ShowTooltip']) { - PMA_Util::PMA_fillTooltip( + PMA_Util::fillTooltip( $tooltip_truename, $tooltip_aliasname, $sts_tmp ); } @@ -195,7 +195,7 @@ if (! isset($sot_ready)) { if ($cfg['ShowTooltip']) { foreach ($tables as $each_table) { - PMA_Util::PMA_fillTooltip( + PMA_Util::fillTooltip( $tooltip_truename, $tooltip_aliasname, $each_table ); } From 7c388f56b2b64fda68b2acb56a5867dce9ddeb54 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 11 Dec 2012 08:19:14 -0500 Subject: [PATCH 05/85] Support ShowTooltip config directive having a value of false --- libraries/navigation/NavigationTree.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 8232207022..27ed87d8b9 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -923,6 +923,8 @@ class PMA_NavigationTree if ($title) { $title = " title='" . htmlentities($title, ENT_QUOTES) . "'"; } + } else { + $title = ''; } $retval .= ""; $retval .= htmlspecialchars($node->real_name); From 28b683b2e9e0d721f5bf394dfc59fefd8a1aab1b Mon Sep 17 00:00:00 2001 From: Dron Rathore Date: Wed, 12 Dec 2012 13:19:18 +0530 Subject: [PATCH 06/85] mysql version should also be included in "require" mysql versions are also varying in functionality, so we should tell that too. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e699491831..13e0955a38 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,7 @@ "source": "https://github.com/phpmyadmin/phpmyadmin" }, "require": { - "php": ">=5.2.0" + "php": ">=5.2.0", + "mysql": ">=5.0" } } From 584c52820378b589198756cad240dda1bbe3710b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 12 Dec 2012 13:03:55 -0500 Subject: [PATCH 07/85] bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid SQL --- ChangeLog | 2 ++ tbl_tracking.php | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bda0a8857..9bd0972489 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ phpMyAdmin - ChangeLog - bug #3588354 [l10n] Portuguese Language not displaying correctly - bug #3591412 [status] Live charts don't work for non-default server - bug [core] Proxy ajax calls to pma.net to avoid browser notices +- bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid +SQL 3.5.4.0 (2012-11-16) - bug #3570212 [edit] uuid_short() is a no-arguments function diff --git a/tbl_tracking.php b/tbl_tracking.php index 38905d4eff..237037000b 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -169,7 +169,13 @@ if (isset($_REQUEST['submit_create_version'])) { } $tracking_set = rtrim($tracking_set, ','); - if (PMA_Tracker::createVersion($GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'], $tracking_set )) { + if (PMA_Tracker::createVersion( + $GLOBALS['db'], + $GLOBALS['table'], + $_REQUEST['version'], + $tracking_set, + PMA_Table::isView($GLOBALS['db'], $GLOBALS['table'])) + ) { $msg = PMA_Message::success(sprintf(__('Version %s is created, tracking for %s.%s is activated.'), htmlspecialchars($_REQUEST['version']), htmlspecialchars($GLOBALS['db']), htmlspecialchars($GLOBALS['table']))); $msg->display(); } @@ -236,10 +242,11 @@ if (isset($_REQUEST['snapshot'])) { Date: Wed, 12 Dec 2012 15:04:55 -0500 Subject: [PATCH 08/85] Fix merge conflicts --- ChangeLog | 2 ++ tbl_tracking.php | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f2678e98f..3cffac4e17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,8 @@ VerboseMultiSubmit, ReplaceHelpImg - bug #3588354 [l10n] Portuguese Language not displaying correctly - bug #3591412 [status] Live charts don't work for non-default server - bug [core] Proxy ajax calls to pma.net to avoid browser notices +- bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid +SQL 3.5.4.0 (2012-11-16) - bug #3570212 [edit] uuid_short() is a no-arguments function diff --git a/tbl_tracking.php b/tbl_tracking.php index 7419e7f964..e0fdb22af7 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -193,7 +193,11 @@ if (isset($_REQUEST['submit_create_version'])) { $tracking_set = rtrim($tracking_set, ','); $versionCreated = PMA_Tracker::createVersion( - $GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'], $tracking_set + $GLOBALS['db'], + $GLOBALS['table'], + $_REQUEST['version'], + $tracking_set, + PMA_Table::isView($GLOBALS['db'], $GLOBALS['table']) ); if ($versionCreated) { $msg = PMA_Message::success( @@ -292,10 +296,11 @@ if (isset($_REQUEST['snapshot'])) { $_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'] ); - // Get first DROP TABLE and CREATE TABLE statements + // Get first DROP TABLE/VIEW and CREATE TABLE/VIEW statements $drop_create_statements = $data['ddlog'][0]['statement']; - if (strstr($data['ddlog'][0]['statement'], 'DROP TABLE')) { + if (strstr($data['ddlog'][0]['statement'], 'DROP TABLE') + || strstr($data['ddlog'][0]['statement'], 'DROP VIEW')) { $drop_create_statements .= $data['ddlog'][1]['statement']; } // Print SQL code From 88b0f56fd1fe66337eb5d3941e7d00419c22a651 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 12 Dec 2012 15:23:14 -0500 Subject: [PATCH 09/85] bug #3544366 [events] Event comments not saved --- ChangeLog | 1 + libraries/rte/rte_events.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9bd0972489..b22d15c79a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug [core] Proxy ajax calls to pma.net to avoid browser notices - bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid SQL +- bug #3544366 [events] Event comments not saved 3.5.4.0 (2012-11-16) - bug #3570212 [edit] uuid_short() is a no-arguments function diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index 41fd467395..52df014847 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -583,7 +583,7 @@ function PMA_EVN_getQueryFromRequest() } } if (! empty($_REQUEST['item_comment'])) { - $query .= "COMMENT '" . $common_functions->sqlAddslashes( + $query .= "COMMENT '" . PMA_sqlAddslashes( $_REQUEST['item_comment'] ) . "' "; } From da0609d1ae76c283c4f7f15454ca951be2685e6b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 12 Dec 2012 15:25:20 -0500 Subject: [PATCH 10/85] Fix merge conflicts --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 3cffac4e17..5882bd5dab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ VerboseMultiSubmit, ReplaceHelpImg - bug [core] Proxy ajax calls to pma.net to avoid browser notices - bug #3593534 [tracking] Struc