diff options
| author | Chad Parry <github@chad.parry.org> | 2011-04-27 20:35:58 -0600 |
|---|---|---|
| committer | Chad Parry <github@chad.parry.org> | 2011-04-27 20:35:58 -0600 |
| commit | 6d564f185e5279d6cca9a7385066514ff18a2455 (patch) | |
| tree | 40d7ebab63894412b57aeb4a7ce660b0c255ac00 /modules/gallery/models | |
| parent | 7ff485fa48c392bbbb0370f67cb1bd6fcc00c2a4 (diff) | |
| parent | 406064087662184ec7f85297b9cdf83a77976616 (diff) | |
Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto
Diffstat (limited to 'modules/gallery/models')
| -rw-r--r-- | modules/gallery/models/item.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index dcdcfd0d..5ccbe75c 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -345,7 +345,7 @@ class Item_Model_Core extends ORM_MPTT { // Make an url friendly slug from the name, if necessary if (empty($this->slug)) { - $this->slug = item::convert_filename_to_slug($this->name); + $this->slug = item::convert_filename_to_slug(pathinfo($this->name, PATHINFO_FILENAME)); // If the filename is all invalid characters, then the slug may be empty here. Pick a // random value. |