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:
Pootle server 2011-08-04 20:40:08 +02:00
commit 4bf7fe8cef
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
file_echo.php
View File

@ -28,10 +28,10 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
$valid_match = '/^[^\n\r]*\.' . $extension . '$/';
if (! preg_match($valid_match, $_REQUEST['filename'])) {
if (! preg_match('/^[^\n\r]*$/', $_REQUEST['filename'])) {
/* Add extension */
$filename = 'dowload.' . $extension;
} else {
/* Filename is unsafe, discard it */
$filename = 'download.' . $extension;
} else {
/* Add extension */
$filename = $_REQUEST['filename'] . '.' . $extension;
}
} else {

4
test/libraries/common/PMA_expandUserString_test.php
View File

@ -38,7 +38,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase
}
/**
* Test case for parsing SHOW COLUNS output
* Test case for expanding strings
*
* @dataProvider provider
*/
@ -48,7 +48,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase
}
/**
* Test case for parsing SHOW COLUNS output
* Test case for expanding strings with escaping
*
* @dataProvider provider
*/

2
test/libraries/common/PMA_extractFieldSpec_test.php
View File

@ -19,7 +19,7 @@ require_once 'libraries/common.lib.php';
class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase
{
/**
* Test case for parsing SHOW COLUNS output
* Test case for parsing SHOW COLUMNS output
*
* @dataProvider provider
*/