From d16af504f6b7158fa5dfca2dde0fa1f9621330ee Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sun, 22 Jun 2014 17:03:27 +0200 Subject: [PATCH] File basename call lacked a dot --- classes/File.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/File.php b/classes/File.php index acc90d495f..b834036405 100644 --- a/classes/File.php +++ b/classes/File.php @@ -245,7 +245,7 @@ class File extends Managed_DataObject } // Normalize and make the original filename more URL friendly. - $origname = basename($origname, $ext); + $origname = basename($origname, ".$ext"); if (class_exists('Normalizer')) { // http://php.net/manual/en/class.normalizer.php // http://www.unicode.org/reports/tr15/ @@ -253,7 +253,7 @@ class File extends Managed_DataObject } $origname = preg_replace('/[^A-Za-z0-9\.\_]/', '_', $origname); - $nickname = $profile->nickname; + $nickname = $profile->getNickname(); $datestamp = strftime('%Y%m%d', time()); do { // generate new random strings until we don't run into a filename collision. -- 2.39.5