GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

File basename call lacked a dot

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-06-22 17:03:27 +02:00
parent e4f1c77d6b
commit d16af504f6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/File.php
View File

@ -245,7 +245,7 @@ class File extends Managed_DataObject
} }
// Normalize and make the original filename more URL friendly. // Normalize and make the original filename more URL friendly.
$origname = basename($origname, $ext); $origname = basename($origname, ".$ext");
if (class_exists('Normalizer')) { if (class_exists('Normalizer')) {
// http://php.net/manual/en/class.normalizer.php // http://php.net/manual/en/class.normalizer.php
// http://www.unicode.org/reports/tr15/ // http://www.unicode.org/reports/tr15/
@ -253,7 +253,7 @@ class File extends Managed_DataObject
} }
$origname = preg_replace('/[^A-Za-z0-9\.\_]/', '_', $origname); $origname = preg_replace('/[^A-Za-z0-9\.\_]/', '_', $origname);
$nickname = $profile->nickname; $nickname = $profile->getNickname();
$datestamp = strftime('%Y%m%d', time()); $datestamp = strftime('%Y%m%d', time());
do { do {
// generate new random strings until we don't run into a filename collision. // generate new random strings until we don't run into a filename collision.