diff options
| author | Chad Parry <github@chad.parry.org> | 2011-04-24 08:28:39 -0600 |
|---|---|---|
| committer | Chad Parry <github@chad.parry.org> | 2011-04-24 08:28:39 -0600 |
| commit | 26585fed03236f0f70a75959e1d3002025f4e15e (patch) | |
| tree | 33a89567f40dbbdb8affcbe76baa27b242bc6d75 /modules/gallery/models | |
| parent | 809567f12850f59bdeb47a2963f6968b99b5a201 (diff) | |
| parent | c8f90e861b866d0caa86343a6c7213e923023d39 (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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index f4d4c521..ba8e7cde 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -345,9 +345,7 @@ class Item_Model_Core extends ORM_MPTT { // Make an url friendly slug from the name, if necessary if (empty($this->slug)) { - $tmp = pathinfo($this->name, PATHINFO_FILENAME); - $tmp = preg_replace("/[^A-Za-z0-9-_]+/", "-", $tmp); - $this->slug = trim($tmp, "-"); + $this->slug = item::convert_filename_to_slug($this->name); // If the filename is all invalid characters, then the slug may be empty here. Pick a // random value. |