Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 29 insertions, 0 deletions

diff --git a/mod/lightpics/upgrades/2009082901.php b/mod/lightpics/upgrades/2009082901.php
new file mode 100644
index 000000000..dfbdf79f4
--- /dev/null
+++ b/mod/lightpics/upgrades/2009082901.php
@@ -0,0 +1,29 @@
+<?php
+
+/********************************************
+ *
+ * Upgrade from Tidypics 1.5 to 1.6
+ *
+ *********************************************/
+
+global $CONFIG;
+
+// add image class
+$id = get_subtype_id("object", "image");
+if ($id != 0) {
+	$table = $CONFIG->dbprefix . 'entity_subtypes';
+	$result = update_data("UPDATE {$table} set class='TidypicsImage' where id={$id}");
+	if (!$result) {
+		register_error('unable to update tidypics image class');
+	}
+}
+
+// add album class
+$id = get_subtype_id("object", "album");
+if ($id != 0) {
+	$table = $CONFIG->dbprefix . 'entity_subtypes';
+	$result = update_data("UPDATE {$table} set class='TidypicsAlbum' where id={$id}");
+	if (!$result) {
+		register_error('unable to update tidypics album class');
+	}
+}