diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-09 08:47:23 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-09 08:47:23 -0700 |
| commit | ac56d84a098a3280addb5ee3763f82686dea5ab2 (patch) | |
| tree | 70d5a48fc8bfcf0a7db0ceb94d284d6df38c92f0 /modules/gallery/helpers | |
| parent | e7e2d99255259a708999727ae3a56777898a3426 (diff) | |
| parent | 74d4a4c0fd0d1aa2e93e62397b0b0a10d55b986d (diff) | |
Merge branch 'master' of git://github.com/bharat/gallery3
Diffstat (limited to 'modules/gallery/helpers')
| -rw-r--r-- | modules/gallery/helpers/movie.php | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/photo.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index fcf1cc54..54159294 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -82,7 +82,7 @@ class movie_Core { $movie->rand_key = ((float)mt_rand()) / (float)mt_getrandmax(); // Randomize the name if there's a conflict - while (ORM::Factory("item") + while (ORM::factory("item") ->where("parent_id", $parent->id) ->where("name", $movie->name) ->find()->id) { diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php index a4bc853b..e8a4f357 100644 --- a/modules/gallery/helpers/photo.php +++ b/modules/gallery/helpers/photo.php @@ -81,7 +81,7 @@ class photo_Core { $photo->rand_key = ((float)mt_rand()) / (float)mt_getrandmax(); // Randomize the name if there's a conflict - while (ORM::Factory("item") + while (ORM::factory("item") ->where("parent_id", $parent->id) ->where("name", $photo->name) ->find()->id) { |