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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-04-20 10:24:30 +02:00
commit 16859cd1ca
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/plugins/transformations/Text_Plain_BinaryToIP.class.php → libraries/plugins/transformations/output/Text_Plain_BinaryToIP.class.php
View File

@ -49,7 +49,10 @@ class Text_Plain_BinaryToIP extends TransformationsPlugin
{
$length = strlen($buffer);
if ($length == 4 || $length == 16) {
return inet_ntop(pack('A' . $length, $buffer));
$val = @inet_ntop(pack('A' . $length, $buffer));
if ($val !== false) {
return $val;
}
}
return $buffer;
}

20
test/libraries/PMA_transformation_test.php
View File

@ -129,15 +129,15 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
3 => 'output/Image_JPEG_Link.class.php',
4 => 'output/Image_PNG_Inline.class.php',
5 => 'output/Text_Octetstream_Sql.class.php',
6 => 'output/Text_Plain_Bool2text.class.php',
7 => 'output/Text_Plain_Dateformat.class.php',
8 => 'output/Text_Plain_External.class.php',
9 => 'output/Text_Plain_Formatted.class.php',
10 => 'output/Text_Plain_Imagelink.class.php',
11 => 'output/Text_Plain_Json.class.php',
12 => 'output/Text_Plain_Sql.class.php',
13 => 'output/Text_Plain_Xml.class.php',
14 => 'Text_Plain_BinaryToIP.class.php',
6 => 'output/Text_Plain_BinaryToIP.class.php',
7 => 'output/Text_Plain_Bool2text.class.php',
8 => 'output/Text_Plain_Dateformat.class.php',
9 => 'output/Text_Plain_External.class.php',
10 => 'output/Text_Plain_Formatted.class.php',
11 => 'output/Text_Plain_Imagelink.class.php',
12 => 'output/Text_Plain_Json.class.php',
13 => 'output/Text_Plain_Sql.class.php',
14 => 'output/Text_Plain_Xml.class.php',
15 => 'Text_Plain_Link.class.php',
16 => 'Text_Plain_Longtoipv4.class.php',
17 => 'Text_Plain_Preappend.class.php',
@ -150,7 +150,6 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
'Text/Plain: Regexvalidation',
'Text/Plain: SqlEditor',
'Text/Plain: XmlEditor',
'Text/Plain: BinaryToIP',
'Text/Plain: Link',
'Text/Plain: Longtoipv4',
'Text/Plain: Preappend',
@ -163,7 +162,6 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
'input/Text_Plain_Regexvalidation.class.php',
'input/Text_Plain_SqlEditor.class.php',
'input/Text_Plain_XmlEditor.class.php',
'Text_Plain_BinaryToIP.class.php',
'Text_Plain_Link.class.php',
'Text_Plain_Longtoipv4.class.php',
'Text_Plain_Preappend.class.php',