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, 52 insertions, 0 deletions

diff --git a/mod/lightpics/actions/photos/admin/upgrade.php b/mod/lightpics/actions/photos/admin/upgrade.php
new file mode 100644
index 000000000..db09ed035
--- /dev/null
+++ b/mod/lightpics/actions/photos/admin/upgrade.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Tidypics upgrade action
+ */
+
+$plugins_path = elgg_get_plugins_path();
+
+require_once "{$plugins_path}lightpics/version.php";
+
+$local_version = elgg_get_plugin_setting('version', 'tidypics');
+
+$local_version = 2009082901;
+if ($version <= $local_version) {
+	register_error('No upgrade required');
+	forward(REFERER);
+}
+
+set_time_limit(0);
+
+$base_dir = "{$plugins_path}lightpics/upgrades";
+
+
+// taken from engine/lib/version.php
+if ($handle = opendir($base_dir)) {
+	$upgrades = array();
+
+	while ($updatefile = readdir($handle)) {
+		// Look for upgrades and add to upgrades list
+		if (!is_dir("$base_dir/$updatefile")) {
+			if (preg_match('/^([0-9]{10})\.(php)$/', $updatefile, $matches)) {
+				$plugin_version = (int) $matches[1];
+				if ($plugin_version > $local_version) {
+					$upgrades[] = "$base_dir/$updatefile";
+				}
+			}
+		}
+	}
+
+	// Sort and execute
+	asort($upgrades);
+
+	if (sizeof($upgrades) > 0) {
+		foreach ($upgrades as $upgrade) {
+			include($upgrade);
+		}
+	}
+}
+
+elgg_set_plugin_setting('version', $version, 'tidypics');
+
+system_message("Tidypics has been upgraded");
+forward(REFERER);