Merge branch 'QA_4_6' into QA_4_6-security
This commit is contained in:
Michal Čihař
commit
1221b5ea4a
@ -8,6 +8,11 @@ phpMyAdmin - ChangeLog
|
||||
- issue #12394 Create view should require a view name
|
||||
- issue #12391 Message with 'Change password successfully' displayed, but does not take effect
|
||||
- issue Tighten control on PHP sessions and session cookies
|
||||
- issue #12409 Re-enable overhead on server databases view
|
||||
- issue #12414 Fixed rendering of Original theme
|
||||
- issue #12413 Fixed deleting users in non English locales
|
||||
- issue #12416 Fixed replication status output in Databases listing
|
||||
- issue #12303 Avoid typecasting to float when not needed
|
||||
|
||||
4.6.3 (2016-06-23)
|
||||
- issue #12249 Fixed cookie path on Windows
|
||||
|
||||
@ -871,7 +871,8 @@ class DatabaseInterface
|
||||
SUM(t.INDEX_LENGTH) AS SCHEMA_INDEX_LENGTH,
|
||||
SUM(t.DATA_LENGTH + t.INDEX_LENGTH)
|
||||
AS SCHEMA_LENGTH,
|
||||
SUM(t.DATA_FREE) AS SCHEMA_DATA_FREE';
|
||||
SUM(IF(t.ENGINE <> \'InnoDB\', t.DATA_FREE, 0))
|
||||
AS SCHEMA_DATA_FREE';
|
||||
}
|
||||
$sql .= '
|
||||
FROM `information_schema`.SCHEMATA s';
|
||||
|
||||
@ -85,7 +85,7 @@ class Util
|
||||
$pow = gmp_strval(gmp_pow($base, $exp));
|
||||
break;
|
||||
case 'pow' :
|
||||
$base = (float) $base;
|
||||
$base = $base;
|
||||
$exp = (int) $exp;
|
||||
$pow = pow($base, $exp);
|
||||
break;
|
||||
@ -1461,8 +1461,7 @@ class Util
|
||||
$unit = $byteUnits[0];
|
||||
|
||||
for ($d = 6, $ex = 15; $d >= 1; $d--, $ex-=3) {
|
||||
// cast to float to avoid overflow
|
||||
$unitSize = (float) $li * self::pow(10, $ex);
|
||||
$unitSize = $li * self::pow(10, $ex);
|
||||
if (isset($byteUnits[$d]) && $value >= $unitSize) {
|
||||
// use 1024.0 to avoid integer overflow on 64-bit machines
|
||||
$value = round($value / (self::pow(1024, $d) / $dh)) /$dh;
|
||||
|
||||
@ -357,9 +357,11 @@ class ServerDatabasesController extends Controller
|
||||
'format' => 'byte',
|
||||
'footer' => 0,
|
||||
);
|
||||
// At this point we were preparing the display of Overhead using DATA_FREE
|
||||
// but its content does not represent the real overhead in the case
|
||||
// of InnoDB
|
||||
$column_order['SCHEMA_DATA_FREE'] = array(
|
||||
'disp_name' => __('Overhead'),
|
||||
'format' => 'byte',
|
||||
'footer' => 0,
|
||||
);
|
||||
|
||||
return $column_order;
|
||||
}
|
||||
@ -482,9 +484,7 @@ class ServerDatabasesController extends Controller
|
||||
);
|
||||
|
||||
if (mb_strlen($key) > 0
|
||||
|| (isset($replication_info[$type]['Do_DB'][0])
|
||||
&& $replication_info[$type]['Do_DB'][0] == ""
|
||||
&& count($replication_info[$type]['Do_DB']) == 1)
|
||||
|| count($replication_info[$type]['Do_DB']) == 0
|
||||
) {
|
||||
// if ($key != null) did not work for index "0"
|
||||
$out = Util::getIcon(
|
||||
|
||||
42
po/fi.po
42
po/fi.po
@ -4,16 +4,16 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.6.2-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2016-05-23 14:29+0200\n"
|
||||
"PO-Revision-Date: 2016-05-19 19:28+0000\n"
|
||||
"Last-Translator: Daniel Linjama <daniel@linjama.com>\n"
|
||||
"Language-Team: Finnish <https://hosted.weblate.org/projects/phpmyadmin/4-6/"
|
||||
"fi/>\n"
|
||||
"PO-Revision-Date: 2016-07-29 11:47+0000\n"
|
||||
"Last-Translator: Juha <jremes@outlook.com>\n"
|
||||
"Language-Team: Finnish "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/4-6/fi/>\n"
|
||||
"Language: fi\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 2.7-dev\n"
|
||||
"X-Generator: Weblate 2.8-dev\n"
|
||||
|
||||
#: changelog.php:37 license.php:33
|
||||
#, php-format
|
||||
@ -3008,8 +3008,8 @@ msgstr "Tietokanta"
|
||||
#, php-format
|
||||
msgid "Showing %1$d bookmark (both private and shared)"
|
||||
msgid_plural "Showing %1$d bookmarks (both private and shared)"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
msgstr[0] "Näytetään %1$d kirjanmerkki (sekä yksityinen että jaettu)"
|
||||
msgstr[1] "Näytetään %1$d kirjanmerkkiä (sekä yksityiset että jaetut)"
|
||||
|
||||
#: libraries/Console.php:107
|
||||
msgid "No bookmarks"
|
||||
@ -5413,14 +5413,11 @@ msgid "Highlight pointer"
|
||||
msgstr "Korosta osoitin"
|
||||
|
||||
#: libraries/config/messages.inc.php:47
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for "
|
||||
#| "import operations."
|
||||
msgid "Enable bzip2 compression for import operations."
|
||||
msgstr ""
|
||||
"Käytä tuontitoiminnoissa [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a]-"
|
||||
"pakkausta."
|
||||
msgstr "Käytä tuontitoiminnoissa bzip2-pakkausta."
|
||||
|
||||
#: libraries/config/messages.inc.php:50
|
||||
msgid "Bzip2"
|
||||
@ -5441,7 +5438,6 @@ msgid "CHAR columns editing"
|
||||
msgstr "CHAR-sarakkeiden muokkaus"
|
||||
|
||||
#: libraries/config/messages.inc.php:58
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Use user-friendly editor for editing SQL queries ([a@http://codemirror."
|
||||
#| "net/]CodeMirror[/a]) with syntax highlighting and line numbers."
|
||||
@ -5449,8 +5445,8 @@ msgid ""
|
||||
"Use user-friendly editor for editing SQL queries (CodeMirror) with syntax "
|
||||
"highlighting and line numbers."
|
||||
msgstr ""
|
||||
"Käytä käyttäjäystävällistä editoria SQL-kyselyiden muokkaamiseen ([a@http://"
|
||||
"codemirror.net/]CodeMirror[/a]) syntaksin korostuksella ja rivinumeroilla."
|
||||
"Käytä käyttäjäystävällistä editoria SQL-kyselyiden (CodeMirror) "
|
||||
"muokkaamiseen syntaksin korostuksella ja rivinumeroilla."
|
||||
|
||||
#: libraries/config/messages.inc.php:62
|
||||
msgid "Enable CodeMirror"
|
||||
@ -6200,14 +6196,11 @@ msgid "Disable some of the warnings shown by phpMyAdmin."
|
||||
msgstr "Kytke osa phpMyAdminin näyttämistä varoituksista pois päältä."
|
||||
|
||||
#: libraries/config/messages.inc.php:353
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for "
|
||||
#| "import and export operations."
|
||||
msgid "Enable gzip compression for import and export operations."
|
||||
msgstr ""
|
||||
"Käytä tuonti- ja vientitoiminnoissa [a@http://en.wikipedia.org/wiki/"
|
||||
"Gzip]gzip[/a]-pakkausta."
|
||||
msgstr "Käytä tuonti- ja vientitoiminnoissa gzip-pakkausta."
|
||||
|
||||
#: libraries/config/messages.inc.php:356
|
||||
msgid "GZip"
|
||||
@ -6907,7 +6900,6 @@ msgid "Authentication type"
|
||||
msgstr "Todennustyyppi"
|
||||
|
||||
#: libraries/config/messages.inc.php:644
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/bookmark]bookmark[/"
|
||||
#| "a] support, suggested: [kbd]pma__bookmark[/kbd]"
|
||||
@ -6915,8 +6907,8 @@ msgid ""
|
||||
"Leave blank for no [doc@bookmarks@]bookmark[/doc] support, suggested: "
|
||||
"[kbd]pma__bookmark[/kbd]"
|
||||
msgstr ""
|
||||
"Jätä tyhjäksi, jos et halua [a@https://wiki.phpmyadmin.net/pma/"
|
||||
"bookmark]kirjanmerkki[/a]tukea, oletusarvo: [kbd]pma__bookmark[/kbd]"
|
||||
"Jätä tyhjäksi, jos et halua [doc@bookmarks@]kirjanmerkki[/doc]tukea, "
|
||||
"oletusarvo: [kbd]pma__bookmark[/kbd]"
|
||||
|
||||
#: libraries/config/messages.inc.php:647
|
||||
msgid "Bookmark table"
|
||||
@ -9097,7 +9089,6 @@ msgstr "Lisätyn rivin tunnus: %1$d"
|
||||
|
||||
#. l10n: This is currently used only in Japanese locales
|
||||
#: libraries/kanji-encoding.lib.php:150
|
||||
#, fuzzy
|
||||
#| msgid "None"
|
||||
msgctxt "None encoding conversion"
|
||||
msgid "None"
|
||||
@ -9106,7 +9097,7 @@ msgstr "Ei mitään"
|
||||
#. l10n: This is currently used only in Japanese locales
|
||||
#: libraries/kanji-encoding.lib.php:161
|
||||
msgid "Convert to Kana"
|
||||
msgstr ""
|
||||
msgstr "Käännä Kana-merkeiksi"
|
||||
|
||||
#: libraries/mult_submits.inc.php:329
|
||||
msgid "Success!"
|
||||
@ -9272,7 +9263,7 @@ msgstr "Romanialainen"
|
||||
|
||||
#: libraries/mysql_charsets.lib.php:235
|
||||
msgid "Sinhalese"
|
||||
msgstr ""
|
||||
msgstr "Sinhali"
|
||||
|
||||
#: libraries/mysql_charsets.lib.php:238
|
||||
msgid "Slovak"
|
||||
@ -9317,10 +9308,9 @@ msgid "multilingual"
|
||||
msgstr "monikielinen"
|
||||
|
||||
#: libraries/mysql_charsets.lib.php:265
|
||||
#, fuzzy
|
||||
#| msgid "Table name"
|
||||
msgid "Vietnamese"
|
||||
msgstr "Taulun nimi"
|
||||
msgstr "Vietnam"
|
||||
|
||||
#: libraries/mysql_charsets.lib.php:293
|
||||
msgid "Central European"
|
||||
|
||||
@ -301,7 +301,7 @@ if ($GLOBALS['is_ajax_request']
|
||||
&& (! isset($_REQUEST['submit_mult']) || $_REQUEST['submit_mult'] != 'export')
|
||||
&& ((! isset($_REQUEST['initial']) || $_REQUEST['initial'] === null
|
||||
|| $_REQUEST['initial'] === '')
|
||||
|| (isset($_REQUEST['delete']) && $_REQUEST['delete'] === 'Go'))
|
||||
|| (isset($_REQUEST['delete']) && $_REQUEST['delete'] === __('Go')))
|
||||
&& ! isset($_REQUEST['showall'])
|
||||
&& ! isset($_REQUEST['edit_user_group_dialog'])
|
||||
&& ! isset($_REQUEST['db_specific'])
|
||||
|
||||
@ -311,6 +311,11 @@ class ServerDatabasesControllerTest extends PMATestCase
|
||||
'disp_name' => __('Total'),
|
||||
'format' => 'byte',
|
||||
'footer' => 0
|
||||
),
|
||||
'SCHEMA_DATA_FREE' => array(
|
||||
'disp_name' => __('Overhead'),
|
||||
'format' => 'byte',
|
||||
'footer' => 0
|
||||
)
|
||||
),
|
||||
$method->invoke($ctrl)
|
||||
|
||||
@ -418,6 +418,7 @@ div.error {
|
||||
margin: 0.3em 0 0 0;
|
||||
border: 2px solid;
|
||||
background-repeat: no-repeat;
|
||||
clear: both;
|
||||
<?php
|
||||
if ($GLOBALS['text_dir'] === 'ltr') { ?>
|
||||
background-position: 10px 50%;
|
||||
@ -878,7 +879,7 @@ div#tablestatistics table {
|
||||
#fieldset_add_user_login label {
|
||||
float: <?php echo $left; ?>;
|
||||
display: block;
|
||||
width: 10em;
|
||||
width: 15em;
|
||||
max-width: 100%;
|
||||
text-align: <?php echo $right; ?>;
|
||||
padding-<?php echo $right; ?>: 0.5em;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
