diff --git a/ChangeLog b/ChangeLog index ca7feb5a17..128f603be1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,7 +46,7 @@ phpMyAdmin - ChangeLog - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing -- bug #3383711 [display] Order by a column in a view doesn't work in some cases +- patch #3383711 [display] Order by a column in a view doesn't work in some cases - bug #3386434 [interface] Add missing space to server status 3.4.4.0 (not yet released) diff --git a/Documentation.html b/Documentation.html index 393e5c710d..72387ab63b 100644 --- a/Documentation.html +++ b/Documentation.html @@ -3095,6 +3095,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
  • suhosin.post.max_array_index_length should be increased (eg. 256)
  • suhosin.request.max_totalname_length should be increased (eg. 8192)
  • suhosin.post.max_totalname_length should be increased (eg. 8192)
    • +
  • suhosin.get.max_value_length should be increased (eg. 1024)
  • suhosin.sql.bailout_on_error needs to be disabled (the default)
  • suhosin.log.* should not include SQL, otherwise you get big slowdown
    • diff --git a/libraries/Table.class.php b/libraries/Table.class.php index d2a0dbecf3..80ab72778a 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -300,7 +300,7 @@ class PMA_Table if (! isset(PMA_Table::$cache[$db][$table][$info])) { if (! $disable_error) { - trigger_error('unknown table status: ' . $info, E_USER_WARNING); + trigger_error(__('unknown table status: ') . $info, E_USER_WARNING); } return false; } @@ -1338,7 +1338,7 @@ class PMA_Table } } else if ($property == self::PROP_COLUMN_ORDER || $property == self::PROP_COLUMN_VISIB) { - if (isset($this->uiprefs[$property])) { + if (! PMA_Table::isView($this->db_name, $this->name) && isset($this->uiprefs[$property])) { // check if the table has not been modified if (self::sGetStatusInfo($this->db_name, $this->name, 'Create_time') == $this->uiprefs['CREATE_TIME']) { @@ -1376,8 +1376,8 @@ class PMA_Table $this->loadUiPrefs(); } // we want to save the create time if the property is PROP_COLUMN_ORDER - if ($property == self::PROP_COLUMN_ORDER || - $property == self::PROP_COLUMN_VISIB) { + if (! PMA_Table::isView($this->db_name, $this->name) && ($property == self::PROP_COLUMN_ORDER || + $property == self::PROP_COLUMN_VISIB)) { $curr_create_time = self::sGetStatusInfo($this->db_name, $this->name, 'CREATE_TIME'); if (isset($table_create_time) && diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 797a3eb3a8..19a1749d01 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -414,8 +414,10 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di echo ''; } // generate table create time - echo ''; + if (! PMA_Table::isView($GLOBALS['table'], $GLOBALS['db'])) { + echo ''; + } } // generate hints echo ''; diff --git a/po/ar.po b/po/ar.po index c99330f693..747deadbef 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-07-25 22:07+0200\n" +"PO-Revision-Date: 2011-08-07 03:51+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -419,10 +419,10 @@ msgid "You have to choose at least one column to display" msgstr "عليك اختيار عمود واحد على الأقل للعرض" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "الباني المرئي" +msgstr "التحويل إلى %sالباني المرئي%s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939 @@ -1154,32 +1154,28 @@ msgid "Average load" msgstr "متوسط التحميل" #: js/messages.php:101 -#, fuzzy #| msgid "System memory" msgid "Total memory" -msgstr "ذاكرة النظام" +msgstr "إجمالي الذاكرة" #: js/messages.php:102 -#, fuzzy #| msgid "System memory" msgid "Cached memory" -msgstr "ذاكرة النظام" +msgstr "الذاكرة المؤقتة" #: js/messages.php:103 msgid "Buffered memory" msgstr "" #: js/messages.php:104 -#, fuzzy #| msgid "System memory" msgid "Free memory" -msgstr "ذاكرة النظام" +msgstr "الذاكرة الحرة" #: js/messages.php:105 -#, fuzzy #| msgid "System memory" msgid "Used memory" -msgstr "ذاكرة النظام" +msgstr "الذاكرة المستخدمة" #: js/messages.php:107 #, fuzzy @@ -1203,13 +1199,12 @@ msgstr "صفحات حرة" #: js/messages.php:112 msgid "Bytes sent" -msgstr "" +msgstr "بايتات أُرسلت" #: js/messages.php:113 -#, fuzzy #| msgid "Received" msgid "Bytes received" -msgstr "استلم" +msgstr "بايتات أُستلمت" #: js/messages.php:114 server_status.php:991 msgid "Connections" @@ -1234,10 +1229,9 @@ msgid "Remove chart" msgstr "حذف الرسم البياني" #: js/messages.php:122 -#, fuzzy #| msgid "Edit labels and series" msgid "Edit title and labels" -msgstr "حذف العناوين والسلاسل" +msgstr "تحرير العناوين" #: js/messages.php:123 msgid "Add chart to grid" @@ -1264,19 +1258,19 @@ msgstr "" #: js/messages.php:130 msgid "general_log and slow_query_log are enabled." -msgstr "" +msgstr "(general_log و slow_query_log) مفعلة." #: js/messages.php:131 msgid "general_log is enabled." -msgstr "" +msgstr "general_log مفعل." #: js/messages.php:132 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log مفعل." #: js/messages.php:133 msgid "slow_query_log and general_log are disabled." -msgstr "" +msgstr "(general_log و slow_query_log) معطلة." #: js/messages.php:134 msgid "log_output is not set to TABLE." @@ -1297,7 +1291,7 @@ msgstr "" #: js/messages.php:137 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time محددة بـ %d ثانية." #: js/messages.php:138 msgid "" @@ -1307,48 +1301,48 @@ msgstr "" #. l10n: %s is FILE or TABLE #: js/messages.php:140 -#, fuzzy, php-format +#, php-format #| msgid "Save as file" msgid "Set log_output to %s" -msgstr "حفظ كملف" +msgstr "تعيين log_output بـ %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:142 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "مفعل" +msgstr "تفعيل %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:144 -#, fuzzy, php-format +#, php-format #| msgid "Disable" msgid "Disable %s" -msgstr "عطل" +msgstr "تعطيل %s" #. l10n: %d seconds #: js/messages.php:146 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "تعيين long_query_time بـ %ds" #: js/messages.php:147 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"لاتستطيع تغير هذه المتغيرات , فضلاً سجل دخولك كمدير أو أتصل بمدير قاعدة " +"البيانات." #: js/messages.php:148 -#, fuzzy #| msgid "General relation features" msgid "Change settings" -msgstr "المزايا العامّة للرابط" +msgstr "تغيير الإعدادات" #: js/messages.php:149 -#, fuzzy #| msgid "General relation features" msgid "Current settings" -msgstr "المزايا العامّة للرابط" +msgstr "الإعدادات الحالية" #: js/messages.php:151 server_status.php:1467 #, fuzzy @@ -1358,15 +1352,14 @@ msgstr "استورد الملفات" #. l10n: As in differential values #: js/messages.php:153 -#, fuzzy #| msgid "Difference" msgid "Differential" -msgstr "فرق" +msgstr "الفارق" #: js/messages.php:154 #, php-format msgid "Divided by %s:" -msgstr "" +msgstr "مقسوم على %s :" #: js/messages.php:156 msgid "From slow log" @@ -1399,10 +1392,9 @@ msgid "Log data loaded. Queries executed in this time span:" msgstr "" #: js/messages.php:163 -#, fuzzy #| msgid "Jump to database" msgid "Jump to Log table" -msgstr "قفز لقاعدة البيانات" +msgstr "قفز لجدول التسجيل" #: js/messages.php:164 msgid "Log analysed, but no data found in this time span." diff --git a/po/de.po b/po/de.po index 1d2fd27cef..6653ff9d25 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-08-05 03:43+0200\n" +"PO-Revision-Date: 2011-08-06 23:06+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -1454,7 +1454,6 @@ msgid "" msgstr "" #: js/messages.php:178 -#, fuzzy #| msgid "Reload" msgid "Reload page" msgstr "Neuladen" @@ -2316,7 +2315,7 @@ msgstr "PBMS: Infos über BLOB nicht erhalten:" #, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "Fehler beim Lesen des BLOB Content-Typs" +msgstr "PBMS konnte den BLOB Content-Typs nicht bestimmen" #: libraries/blobstreaming.lib.php:358 msgid "View image" @@ -6324,10 +6323,9 @@ msgid "Stand-in structure for view" msgstr "Stellvertreter-Struktur des Views" #: libraries/export/sql.php:1071 -#, fuzzy #| msgid "Allows reading data." msgid "Error reading data:" -msgstr "Erlaubt das Auslesen von Daten." +msgstr "Fehler beim Lesen der Daten:" #: libraries/export/xml.php:19 libraries/import/xml.php:21 msgid "XML" @@ -6394,10 +6392,10 @@ msgid "Go to database" msgstr "Gehe zur Datenbank" #: libraries/import.lib.php:1077 libraries/import.lib.php:1101 -#, fuzzy, php-format +#, php-format #| msgid "Missing data for %s" msgid "Edit settings for %s" -msgstr "Fehlende Daten für %s" +msgstr "Einstellung für %s bearbeiten" #: libraries/import.lib.php:1096 msgid "Go to table" @@ -6407,7 +6405,7 @@ msgstr "Gehe zur Tabelle" #, fuzzy, php-format #| msgid "Structure only" msgid "Structure of %s" -msgstr "Nur Struktur" +msgstr "Struktur von %s" #: libraries/import.lib.php:1105 msgid "Go to view" @@ -10120,7 +10118,6 @@ msgid "Refresh rate" msgstr "Aktualisierungs-Intervall" #: server_status.php:1414 -#, fuzzy #| msgid "Chart columns:" msgid "Chart columns" msgstr "Schaubild-Spalten" diff --git a/po/ja.po b/po/ja.po index 96ce7a5305..97a2e00078 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-08-05 12:00+0200\n" +"PO-Revision-Date: 2011-08-06 12:16+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -417,7 +417,7 @@ msgstr "最低 1 つは表示するカラムを選択してください" #, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "%sビジュアル クエリ ビルダ%s に切り替える" +msgstr "%sビジュアル・クエリ・ビルダ%sに切り替える" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939 @@ -1150,64 +1150,56 @@ msgid "Average load" msgstr "平均負荷" #: js/messages.php:101 -#, fuzzy #| msgid "System memory" msgid "Total memory" -msgstr "システムメモリ" +msgstr "総メモリ" #: js/messages.php:102 -#, fuzzy #| msgid "System memory" msgid "Cached memory" -msgstr "システムメモリ" +msgstr "キャッシュ割り当てメモリ" #: js/messages.php:103 -#, fuzzy #| msgid "Buffer Pool" msgid "Buffered memory" -msgstr "バッファプール" +msgstr "バッファ割り当てメモリ" #: js/messages.php:104 -#, fuzzy #| msgid "System memory" msgid "Free memory" -msgstr "システムメモリ" +msgstr "空きメモリ" #: js/messages.php:105 -#, fuzzy #| msgid "System memory" msgid "Used memory" -msgstr "システムメモリ" +msgstr "使用中メモリ" #: js/messages.php:107 -#, fuzzy #| msgid "Total" msgid "Total Swap" -msgstr "合計" +msgstr "総スワップ領域" #: js/messages.php:108 msgid "Cached Swap" -msgstr "" +msgstr "キャッシュ割り当てスワップ領域" #: js/messages.php:109 msgid "Used Swap" -msgstr "" +msgstr "使用中スワップ領域" #: js/messages.php:110 -#, fuzzy #| msgid "Free pages" msgid "Free Swap" -msgstr "フリーページ数" +msgstr "空きスワップ領域" #: js/messages.php:112 msgid "Bytes sent" -msgstr "" +msgstr "送信" #: js/messages.php:113 -#, fuzzy #| msgid "Received" msgid "Bytes received" -msgstr "受信済" +msgstr "受信" #: js/messages.php:114 server_status.php:991 msgid "Connections" @@ -1439,7 +1431,7 @@ msgstr "ログの読み込み" #: js/messages.php:176 msgid "Monitor refresh failed" -msgstr "" +msgstr "モニタの再描画に失敗しました" #: js/messages.php:177 msgid "" @@ -1994,7 +1986,8 @@ msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "" -"アップロードされたファイルの移動に失敗しました。FAQ 1.11 をご覧ください。" +"アップロードされたファイルの移動に失敗しました。[a@./Documentation.html#faq1_11@Documentation]FAQ " +"1.11[/a] をご覧ください。" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." @@ -2294,10 +2287,9 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS が BLOB 情報取得に失敗しました:" #: libraries/blobstreaming.lib.php:332 -#, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "BLOB の Content-Type の 取得に失敗しました" +msgstr "PBMS が BLOB の Content-Type の 取得に失敗しました" #: libraries/blobstreaming.lib.php:358 msgid "View image" @@ -4579,7 +4571,7 @@ msgstr "パスワード変更フォームの表示" #: libraries/config/messages.inc.php:452 msgid "Show create database form" -msgstr "「新規データベース作成」部分を表示する" +msgstr "「データベースを作成する」の部分を表示する" #: libraries/config/messages.inc.php:453 msgid "" @@ -9938,7 +9930,6 @@ msgid "Refresh rate" msgstr "再描画間隔" #: server_status.php:1414 -#, fuzzy #| msgid "Chart columns:" msgid "Chart columns" msgstr "1 段のグラフ数" diff --git a/po/tr.po b/po/tr.po index b8efcb3ec9..5c1d4a2f2e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-08-04 19:08+0200\n" +"PO-Revision-Date: 2011-08-06 11:10+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -414,10 +414,10 @@ msgid "You have to choose at least one column to display" msgstr "Görüntülemek için en az bir sütun seçmelisiniz" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "görsel yaratıcı" +msgstr "%sGörsel yaratıcı'ya%s geç" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939 @@ -2279,10 +2279,9 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS, BLOB bilgisi alması başarısız:" #: libraries/blobstreaming.lib.php:332 -#, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "BLOB İçerik Türü alma başarısız" +msgstr "PBMS, BLOB İçerik Türü alması başarısız" #: libraries/blobstreaming.lib.php:358 msgid "View image" @@ -6283,10 +6282,9 @@ msgid "Stand-in structure for view" msgstr "Görünüm yapısı durumu" #: libraries/export/sql.php:1071 -#, fuzzy #| msgid "Allows reading data." msgid "Error reading data:" -msgstr "Veri okunmasına izin verir." +msgstr "Veri okunması hatası:" #: libraries/export/xml.php:19 libraries/import/xml.php:21 msgid "XML" @@ -6351,20 +6349,20 @@ msgid "Go to database" msgstr "Veritabanına git" #: libraries/import.lib.php:1077 libraries/import.lib.php:1101 -#, fuzzy, php-format +#, php-format #| msgid "Missing data for %s" msgid "Edit settings for %s" -msgstr "%s için kayıp veri" +msgstr "%s için ayarları düzenle" #: libraries/import.lib.php:1096 msgid "Go to table" msgstr "Tabloya git" #: libraries/import.lib.php:1099 -#, fuzzy, php-format +#, php-format #| msgid "Structure only" msgid "Structure of %s" -msgstr "Sadece yapı" +msgstr "%s yapısı" #: libraries/import.lib.php:1105 msgid "Go to view"