summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-10-21 11:47:40 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-10-21 11:47:40 -0700
commit59a001b49131874e732091e5b190cabd70d28e78 (patch)
tree4472f1ee517fb84a306173f3809d1103012c458f /modules
parentea2ab0c654c5b13c12ad424268d5755aa712dfc2 (diff)
parentb91da7472651ac5efab668ea6215a4fbaea43f0f (diff)
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/helpers/photo.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 203862cd..193293e8 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -26,7 +26,7 @@
class photo_Core {
/**
* Create a new photo.
- * @param integer $parent_id id of parent album
+ * @param integer $parent parent album
* @param string $filename path to the photo file on disk
* @param string $name the filename to use for this photo in the album
* @param integer $title the title of the new photo