summaryrefslogtreecommitdiff
path: root/modules/gallery/models
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2011-04-27 19:30:00 -0700
committerTim Almdal <tnalmdal@shaw.ca>2011-04-27 19:30:00 -0700
commit4e20e71d0375ed65d75dbdb12113f737db90b3e7 (patch)
tree51d15ed4ac3ee4f44886f94ed8c3197c76d050ac /modules/gallery/models
parent7f48671186a4bf3a4745cd7a31b48a891dd83078 (diff)
parent7577d02fe2f2c37a79caf6a32b246f5a046c917a (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/models')
-rw-r--r--modules/gallery/models/item.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index f46db696..2a5e6894 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -336,7 +336,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.