aboutsummaryrefslogtreecommitdiff
path: root/classes/File.php
diff options
context:
space:
mode:
authorMikael Nordfeldth <mmn@hethane.se>2014-06-22 17:03:27 +0200
committerMikael Nordfeldth <mmn@hethane.se>2014-06-22 17:05:11 +0200
commitd16af504f6b7158fa5dfca2dde0fa1f9621330ee (patch)
tree49e84de88f4322b8245981469f4c60fb44e96b09 /classes/File.php
parente4f1c77d6be00da966c9a494ca33928965e98679 (diff)
downloadgnu-social-d16af504f6b7158fa5dfca2dde0fa1f9621330ee.tar
gnu-social-d16af504f6b7158fa5dfca2dde0fa1f9621330ee.zip
File basename call lacked a dot
Diffstat (limited to 'classes/File.php')
-rw-r--r--classes/File.php4
1 files 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.