1.6.4

diff --git a/actions/upload.php b/actions/upload.php
index 228253ddda5c177606ef531aa04995af27108929..3aa7394145e9f4b01e4606c82ddf050b044285ef 100644 (file)
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -192,6 +192,9 @@
                // update user/group size for checking quota\r
                $image_repo_size += $sent_file['size'];\r
 \r
+               // plugins can register to be told when a new image has been uploaded\r
+               trigger_elgg_event('upload', 'tp_image', $file);\r
+               \r
                // successful upload so check if this is a new album and throw river event/notification if so\r
                if ($album->new_album == TP_NEW_ALBUM) {\r
                        $album->new_album = TP_OLD_ALBUM;\r

diff --git a/contributions.txt b/contributions.txt
index 4400b9689c59492c8a4c8e9fc182cf1b2fca8529..e324f71f513ee771695c9121b67a063fd210d44b 100644 (file)
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,18 @@
 See individual change logs for contributors to those builds\r
 \r
+------------------------------------------------------------------------\r
+Version 1.6.4 Change List\r
+Release Date: 10/05/2009\r
+------------------------------------------------------------------------\r
+BEGIN VERSION 1.6.4 CHANGES\r
+------------------------------------------------------------------------\r
+ * Bug fixes\r
+ * Improved watermarking\r
+ * Add slideshow code by Torsten\r
+------------------------------------------------------------------------\r
+END VERSION 1.6.4 CHANGES\r
+------------------------------------------------------------------------\r
+\r
 ------------------------------------------------------------------------\r
 Version 1.6.3 Change List\r
 Release Date: 09/13/2009\r

diff --git a/docs/extending_tidypics.txt b/docs/extending_tidypics.txt
index 58fba6721fafe3a2f560541a8253f3dc54dcc9ff..55e6b5dd547f0fbab14b8808cf96271075dad4a5 100644 (file)
--- a/docs/extending_tidypics.txt
+++ b/docs/extending_tidypics.txt
@@ -18,9 +18,10 @@ different css elements and where they are used.
 1. album created: 'add', 'tp_album'\r
 2. album updated: 'update', 'tp_album'\r
 3. album deleted: 'delete', 'tp_album'\r
-4. photos uploaded: 'upload', 'tp_album'\r
-5. photo edited: 'update', 'tp_image'\r
-6. photo deleted: 'delete', 'tp_image'  \r
+4. photos uploaded: 'upload', 'tp_album' - triggered after a set have been uploaded and resized\r
+5. photo uploaded: 'upload', 'tp_image' - triggered after each image is resized\r
+6. photo edited: 'update', 'tp_image'\r
+7. photo deleted: 'delete', 'tp_image'  \r
 \r
 *** TIDYPICS PLUGIN HOOKS ***\r
 1. album slideshow: 'tp_slideshow', 'album' - return false to not have a slideshow, otherwise return link to slideshow\r

diff --git a/languages/en.php b/languages/en.php
index 7dd7636dd7c568d205614f339d1eb7254733fd82..4fc9bcd6425989cf26ba3a1a3ec0425574b3087e 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -24,7 +24,7 @@
                        'album:group' => "Group albums",\r
                        'item:object:image' => "Photos",\r
                        'item:object:album' => "Albums",\r
-                       'tidypics:uploading:images' => "Please wait. Uploading images...",\r
+                       'tidypics:uploading:images' => "Please wait. Uploading images.",\r
                        'tidypics:enablephotos' => 'Enable group photo albums',\r
                        'tidypics:editprops' => 'Edit Image Properties',\r
                        'tidypics:mostcommented' => 'Most commented images',\r

diff --git a/manifest.xml b/manifest.xml
index 4631aeb2d20c78701d801eb1cd830990b8c44c28..d5867272273e8e214a795626db7ac0f827a0e131 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="The TidyPics team." />
-        <field key="version" value="1.6.3" />
+        <field key="author" value="The TidyPics team" />
+        <field key="version" value="1.6.4" />
         <field key="description" value="Tidypics Photo Gallery Plugin" />
         <field key="website" value="http://code.google.com/p/tidypics/" />
         <field key="copyright" value="2008-2009 Jade Dominguez, Gabriel Monge-Franco, Cash Costello" />