diff --git a/ChangeLog b/ChangeLog index 44db2cedb6..0c2e874c14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ underscore 3.5.8.0 (not yet released) - bug #3828 MariaDB reported as MySQL +- bug #3854 Incorrect header for Safari 6.0 3.5.7.0 (2013-02-15) - bug #3779 [core] Problem with backslash in enum fields diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 34f822b740..c470487ec5 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -220,6 +220,18 @@ class PMA_Config ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]); $this->set('PMA_USR_BROWSER_AGENT', 'CHROME'); + // newer Safari + } elseif (preg_match( + '@Mozilla/([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) + && preg_match('@Version/(.*) Safari@', $HTTP_USER_AGENT, $log_version2) + ) { + $this->set( + 'PMA_USR_BROWSER_VER', $log_version2[1] + ); + $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI'); + // older Safari } elseif (preg_match( '@Mozilla/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, diff --git a/libraries/Header.class.php b/libraries/Header.class.php index fc55112116..c2e25769af 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -445,7 +445,9 @@ class PMA_Header . "options inline-script eval-script;" . "img-src 'self' data:; " ); - if (PMA_USR_BROWSER_AGENT == 'SAFARI') { + if (PMA_USR_BROWSER_AGENT == 'SAFARI' + && PMA_USR_BROWSER_VER < '6.0.0' + ) { header( "X-WebKit-CSP: allow 'self';" . "options inline-script eval-script;" diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 2a65ca887e..152b155475 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -566,7 +566,9 @@ class PMA_Index $r .= '' . __('Cardinality') . ''; $r .= '' . __('Collation') . ''; $r .= '' . __('Null') . ''; - $r .= '' . __('Comment') . ''; + if (PMA_MYSQL_INT_VERSION > 50500) { + $r .= '' . __('Comment') . ''; + } $r .= ''; $r .= ''; $r .= ''; @@ -658,7 +660,8 @@ class PMA_Index . htmlspecialchars($column->getNull(true)) . ''; - if ($column->getSeqInIndex() == 1) { + if (PMA_MYSQL_INT_VERSION > 50500 + && $column->getSeqInIndex() == 1) { $r .= '' . htmlspecialchars($index->getComments()) . ''; } diff --git a/po/nb.po b/po/nb.po index d68d3fc82d..66eb6ceb90 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-03-21 17:02-0400\n" -"PO-Revision-Date: 2013-03-06 13:26+0200\n" -"Last-Translator: Axel Sjøstedt \n" -"Language-Team: Norwegian Bokmål \n" +"PO-Revision-Date: 2013-03-26 11:59+0200\n" +"Last-Translator: Stian Berg \n" +"Language-Team: Norwegian Bokmål " +"\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.5-dev\n" @@ -619,8 +619,8 @@ msgid "" "You probably tried to upload a file that is too large. Please refer to %" "sdocumentation%s for a workaround for this limit." msgstr "" -"Fila du forsøkte å laste opp var sannsynligvis for stor. Sjekk %" -"sdokumentasjonen%s for å omgå denne begrensningen." +"Du forsøkte sannsynligvis å laste opp en fil som var for stor. Sjekk %" +"sdokumentasjonen%s for måter å omgå denne begrensningen på." #: import.php:248 import.php:513 msgid "Showing bookmark" @@ -720,7 +720,7 @@ msgstr "Kollasjon for SQL-oppkobling" #: index.php:182 msgid "Appearance Settings" -msgstr "Visningsinnstillinger" +msgstr "Innstillinger for visning" #: index.php:212 prefs_manage.php:275 msgid "More settings" @@ -728,7 +728,7 @@ msgstr "Flere innstillinger" #: index.php:233 msgid "Database server" -msgstr "Database-server" +msgstr "Databaseserver" #: index.php:236 libraries/Menu.class.php:150 #: libraries/ServerStatusData.class.php:339 libraries/common.inc.php:654 @@ -767,7 +767,7 @@ msgstr "Webserver" #: index.php:282 msgid "Database client version" -msgstr "Database-versjon" +msgstr "Databaseklientversjon" #: index.php:286 msgid "PHP extension" @@ -872,8 +872,8 @@ msgid "" "exists in your phpMyAdmin directory. You should remove it once phpMyAdmin " "has been configured." msgstr "" -"Mappe [code]config[/code], som blir brukt av setupskriptet eksisterer " -"fortsatt i din phpMyAdmin mappe. Du bør fjerne den så fort phpMyAdming har " +"Mappen [code]config[/code], som blir brukt av setupskriptet eksisterer " +"fortsatt i din phpMyAdmin mappe. Du bør fjerne den så fort phpMyAdmin har " "blitt konfigurert." #: index.php:470 @@ -3080,10 +3080,9 @@ msgid "Query statistics" msgstr "Spørringsstatistikk" #: libraries/ServerStatusData.class.php:347 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Se slavestatustabell" +msgstr "Alle statusvariabler" #: libraries/ServerStatusData.class.php:351 msgid "Monitor" diff --git a/tbl_indexes.php b/tbl_indexes.php index 6a8a38e28c..a778814c32 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -99,7 +99,11 @@ if (isset($_REQUEST['do_save_data'])) { $sql_query .= ' (' . implode(', ', $index_fields) . ')'; } - $sql_query .= "COMMENT '" . PMA_Util::sqlAddSlashes($index->getComment()) . "'"; + if (PMA_MYSQL_INT_VERSION > 50500) { + $sql_query .= "COMMENT '" + . PMA_Util::sqlAddSlashes($index->getComment()) + . "'"; + } $sql_query .= ';'; if (! $error) { @@ -220,6 +224,9 @@ echo PMA_Util::showHint( value="getName()); ?>" onfocus="this.select()" /> + 50500) { +?>
@@ -232,6 +239,9 @@ echo PMA_Util::showHint( value="getComment()); ?>" onfocus="this.select()" />
+
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php index 3607e83501..8be6507584 100644 --- a/test/classes/PMA_Config_test.php +++ b/test/classes/PMA_Config_test.php @@ -162,7 +162,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.4+ (KHTML, like Gecko) Version/5.0 Safari/535.4+ SUSE/12.1 (3.2.1) Epiphany/3.2.1', 'Linux', 'SAFARI', - '5.0.535', + '5.0', ), );