From 2791c3adc9c576d939e793750bed2d30f5963254 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 6 Oct 2009 00:11:14 +0000
Subject: 1.6.4

---
 actions/upload.php          |  3 +++
 contributions.txt           | 13 +++++++++++++
 docs/extending_tidypics.txt |  7 ++++---
 languages/en.php            |  2 +-
 manifest.xml                |  4 ++--
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index 228253ddd..3aa739414 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -192,6 +192,9 @@
 		// update user/group size for checking quota
 		$image_repo_size += $sent_file['size'];
 
+		// plugins can register to be told when a new image has been uploaded
+		trigger_elgg_event('upload', 'tp_image', $file);
+		
 		// successful upload so check if this is a new album and throw river event/notification if so
 		if ($album->new_album == TP_NEW_ALBUM) {
 			$album->new_album = TP_OLD_ALBUM;
diff --git a/contributions.txt b/contributions.txt
index 4400b9689..e324f71f5 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,18 @@
 See individual change logs for contributors to those builds
 
+------------------------------------------------------------------------
+Version 1.6.4 Change List
+Release Date: 10/05/2009
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.4 CHANGES
+------------------------------------------------------------------------
+ * Bug fixes
+ * Improved watermarking
+ * Add slideshow code by Torsten
+------------------------------------------------------------------------
+END VERSION 1.6.4 CHANGES
+------------------------------------------------------------------------
+
 ------------------------------------------------------------------------
 Version 1.6.3 Change List
 Release Date: 09/13/2009
diff --git a/docs/extending_tidypics.txt b/docs/extending_tidypics.txt
index 58fba6721..55e6b5dd5 100644
--- 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'
 2. album updated: 'update', 'tp_album'
 3. album deleted: 'delete', 'tp_album'
-4. photos uploaded: 'upload', 'tp_album'
-5. photo edited: 'update', 'tp_image'
-6. photo deleted: 'delete', 'tp_image'  
+4. photos uploaded: 'upload', 'tp_album' - triggered after a set have been uploaded and resized
+5. photo uploaded: 'upload', 'tp_image' - triggered after each image is resized
+6. photo edited: 'update', 'tp_image'
+7. photo deleted: 'delete', 'tp_image'  
 
 *** TIDYPICS PLUGIN HOOKS ***
 1. album slideshow: 'tp_slideshow', 'album' - return false to not have a slideshow, otherwise return link to slideshow
diff --git a/languages/en.php b/languages/en.php
index 7dd7636dd..4fc9bcd64 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -24,7 +24,7 @@
 			'album:group' => "Group albums",
 			'item:object:image' => "Photos",
 			'item:object:album' => "Albums",
-			'tidypics:uploading:images' => "Please wait. Uploading images...",
+			'tidypics:uploading:images' => "Please wait. Uploading images.",
 			'tidypics:enablephotos' => 'Enable group photo albums',
 			'tidypics:editprops' => 'Edit Image Properties',
 			'tidypics:mostcommented' => 'Most commented images',
diff --git a/manifest.xml b/manifest.xml
index 4631aeb2d..d58672722 100644
--- 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" />
-- 
cgit v1.2.3