diff --git a/ChangeLog b/ChangeLog index fada16ecd..656e7e29c 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-06-30 Marc Delisle + * tbl_change.php3, lang/*: merge patch: "do not edit blobs" from + Bernard M. Piller + ======================================================================================== 2001-06-30 Olivier Müller IMPORTANT : FROM NOW, PLEASE COMMIT YOUR CHANGES IN THE PHPMYADMIN-DEVEL BRANCH! diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index f9535ad4a..7c5e6fe47 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Sim"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index 267673c73..6e5816a93 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -270,4 +270,6 @@ $strYes = " // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index 767b98f90..fb6e4f5fc 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Si"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index 71c71fd03..e375ac468 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -270,4 +270,6 @@ $strYes = " // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index deaaaab43..80252f19f 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -270,4 +270,6 @@ $strYes = " // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index 7793c8aed..28560e317 100644 --- a/lang/czech-iso.inc.php3 +++ b/lang/czech-iso.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Ano"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index 8b4633d43..cd7e20035 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Ano"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index 42e4065a7..a61ec377b 100644 --- a/lang/danish.inc.php3 +++ b/lang/danish.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index 6a58af628..18d127dcf 100644 --- a/lang/dutch.inc.php3 +++ b/lang/dutch.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 1c8025370..479ebd43c 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Yes"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary="Binary"; +$strBinaryDoNotEdit="Binary - do not edit"; +?> diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index b70bb4338..c45a4c76b 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Oui"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary="Binaire"; +$strBinaryDoNotEdit="Binaire - ne pas éditer"; +?> diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index ee164cd88..5d18a2e69 100644 --- a/lang/german.inc.php3 +++ b/lang/german.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3 index cc7ab2b54..e0d39292c 100644 --- a/lang/italian.inc.php3 +++ b/lang/italian.inc.php3 @@ -270,4 +270,6 @@ $strYes = " Si "; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/japanese.inc.php3 b/lang/japanese.inc.php3 index 3c0da29bf..0d997b989 100644 --- a/lang/japanese.inc.php3 +++ b/lang/japanese.inc.php3 @@ -270,4 +270,6 @@ $strYes = " // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3 index 625cc03f4..79d1b67a0 100644 --- a/lang/korean.inc.php3 +++ b/lang/korean.inc.php3 @@ -270,4 +270,6 @@ $strYes = " // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index 22a407336..70d743204 100644 --- a/lang/norwegian.inc.php3 +++ b/lang/norwegian.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index 98b1d1cdd..554bcc4fa 100644 --- a/lang/polish.inc.php3 +++ b/lang/polish.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Tak"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index 44893ad95..60f893a7c 100644 --- a/lang/portuguese.inc.php3 +++ b/lang/portuguese.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Sim"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index 970fa7509..3b0e84a64 100644 --- a/lang/russian-koi8.inc.php3 +++ b/lang/russian-koi8.inc.php3 @@ -270,4 +270,6 @@ $strYes = " // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index dbbb873b3..9afa5d4b5 100644 --- a/lang/russian-win1251.inc.php3 +++ b/lang/russian-win1251.inc.php3 @@ -270,4 +270,6 @@ $strYes = " // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index 0b439ba40..5fc131e80 100644 --- a/lang/spanish.inc.php3 +++ b/lang/spanish.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Si"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index 0f7dd9e93..6837dda47 100644 --- a/lang/swedish.inc.php3 +++ b/lang/swedish.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index fdeb17337..5baa38008 100644 --- a/lang/thai.inc.php3 +++ b/lang/thai.inc.php3 @@ -270,4 +270,6 @@ $strYes = "Yes"; //to translate // automatic generated by langxlorer.php (June 27, 2001, 6:53 pm) // V0.11 - experimental (Steve Alberty - alberty@neptunlabs.de) -?> \ No newline at end of file +$strBinary=" Binary "; //to translate +$strBinaryDoNotEdit=" Binary - do not edit "; //to translate +?> diff --git a/tbl_change.php3 b/tbl_change.php3 index d1599ffa0..916015195 100755 --- a/tbl_change.php3 +++ b/tbl_change.php3 @@ -70,10 +70,24 @@ for($i=0;$i$type\n"; - echo "\n"; + + // THE FUNCTION COLUMN + // Change by Bernard M. Piller + // We don't want binary data to be destroyed + if(strstr($row_table_def["Type"], "blob")) + { + echo "$strBinary"; + } + else + { + + echo "\n"; + } + + // THE VALUE COLUMN if(isset($row) && isset($row[$field])) { $special_chars = htmlspecialchars($row[$field]); @@ -170,6 +184,12 @@ for($i=0;$i"; } + // Change by Bernard M. Piller + // We don't want binary data destroyed + elseif(strstr($row_table_def["Type"], "blob")) + { + echo "" . $strBinaryDoNotEdit . ""; + } else { echo "";