gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2013-03-26 20:01:01 +05:30
commit 3d5484736a
7 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

12
libraries/Config.class.php
View File

@ -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,

4
libraries/Header.class.php
View File

@ -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;"

7
libraries/Index.class.php
View File

@ -566,7 +566,9 @@ class PMA_Index
$r .= '<th>' . __('Cardinality') . '</th>';
$r .= '<th>' . __('Collation') . '</th>';
$r .= '<th>' . __('Null') . '</th>';
$r .= '<th>' . __('Comment') . '</th>';
if (PMA_MYSQL_INT_VERSION > 50500) {
$r .= '<th>' . __('Comment') . '</th>';
}
$r .= '</tr>';
$r .= '</thead>';
$r .= '<tbody>';
@ -658,7 +660,8 @@ class PMA_Index
. htmlspecialchars($column->getNull(true))
. '</td>';
if ($column->getSeqInIndex() == 1) {
if (PMA_MYSQL_INT_VERSION > 50500
&& $column->getSeqInIndex() == 1) {
$r .= '<td ' . $row_span . '>'
. htmlspecialchars($index->getComments()) . '</td>';
}

27
po/nb.po
View File

@ -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 <axel-pma@sjostedt.no>\n"
"Language-Team: Norwegian Bokmål <http://l10n.cihar.com/projects/phpmyadmin/"
"master/nb/>\n"
"PO-Revision-Date: 2013-03-26 11:59+0200\n"
"Last-Translator: Stian Berg <mail.to.stian@gmail.com>\n"
"Language-Team: Norwegian Bokmål "
"<http://l10n.cihar.com/projects/phpmyadmin/master/nb/>\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"

12
tbl_indexes.php
View File

@ -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="<?php echo htmlspecialchars($index->getName()); ?>"
onfocus="this.select()" />
</div>
<?php
if (PMA_MYSQL_INT_VERSION > 50500) {
?>
<div>
<div class="label">
<strong>
@ -232,6 +239,9 @@ echo PMA_Util::showHint(
value="<?php echo htmlspecialchars($index->getComment()); ?>"
onfocus="this.select()" />
</div>
<?php
}
?>
<div>
<div class="label">
<strong>

2
test/classes/PMA_Config_test.php
View File

@ -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',
),
);