tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.6' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2017-07-14 14:53:06 +01:00
commit 36666eb348
No known key found for this signature in database
GPG Key ID: 5DE415D786BBB2FD
3 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
filesystem/File.php
View File

@ -889,24 +889,21 @@ class File extends DataObject {
* @return int
*/
public static function ini2bytes($iniValue) {
$iniValues = str_split(trim($iniValue));
$unit = strtolower(array_pop($iniValues));
$quantity = (int) implode($iniValues);
switch ($unit) {
case 'g':
$quantity *= 1024;
// deliberate no break
case 'm':
$quantity *= 1024;
// deliberate no break
case 'k':
$quantity *= 1024;
// deliberate no break
default:
// no-op: pre-existing behaviour
break;
// Remove non-unit characters from the size
$unit = preg_replace('/[^bkmgtpezy]/i', '', $iniValue);
// Remove non-numeric characters from the size
$size = preg_replace('/[^0-9\.]/', '', $iniValue);
if ($unit) {
// Find the position of the unit in the ordered string which is the power
// of magnitude to multiply a kilobyte by
$size = round($size * pow(1024, stripos('bkmgtpezy', $unit[0])));
} else {
$size = round($size);
}
return $quantity;
// Cast to int - round() returns a float
return (int)$size;
}
/**

7
javascript/HtmlEditorField.js
View File

@ -868,14 +868,15 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
// // Element contains a link
// var firstLinkEl = selectedEl.find('a:first');
// if(firstLinkEl.length) linkDataSource = firstLinkEl;
// if(linkDataSource && linkDataSource.length) this.modifySelection(function(ed){
// ed.selectNode(linkDataSource[0]);
// });
} else {
// Element is a child of a link
linkDataSource = selectedEl = selectedEl.parents('a:first');
}
}
if(linkDataSource && linkDataSource.length) this.modifySelection(function(ed){
ed.selectNode(linkDataSource[0]);
});
// Is anchor not a link
if (!linkDataSource.attr('href')) linkDataSource = null;

27
tests/filesystem/FileTest.php
View File

@ -413,6 +413,33 @@ class FileTest extends SapphireTest {
$this->assertTrue($file->canEdit(), "Admins can edit files");
}
/**
* Test that ini2bytes returns the number of bytes for a PHP ini style size declaration
*
* @param string $iniValue
* @param int $expected
* @dataProvider ini2BytesProvider
*/
public function testIni2Bytes($iniValue, $expected) {
$this->assertSame($expected, File::ini2bytes($iniValue));
}
/**
* @return array
*/
public function ini2BytesProvider() {
return array(
array('2048', 2 * 1024),
array('2k', 2 * 1024),
array('512M', 512 * 1024 * 1024),
array('512MiB', 512 * 1024 * 1024),
array('512 mbytes', 512 * 1024 * 1024),
array('512 megabytes', 512 * 1024 * 1024),
array('1024g', 1024 * 1024 * 1024 * 1024),
array('1024G', 1024 * 1024 * 1024 * 1024)
);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
public function setUp() {