From 1026deb7ef24677a2a0b48b4297911a4c2eceb6d Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 4 Feb 2011 21:04:34 +0000
Subject: Added new priority 'requires' for plugin dep system. You can now say
 that a plugin is required to be after / before another plugin in the system.

git-svn-id: http://code.elgg.org/elgg/trunk@8016 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/plugins.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'engine/lib/plugins.php')

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 2174814bd..e61874ebc 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -669,6 +669,7 @@ function elgg_get_plugin_dependency_strings($dep) {
 	'requires'	'php setting bob'	>3		3		'change it'
 	'conflicts'	'php setting'		>3		4		'change it'
 	'provides'	'plugin oauth_lib'	1.3		--		--
+	'priority'	'before blog'		--		after	'move it'
 	*/
 	$strings = array();
 	$strings['type'] = elgg_echo('ElggPlugin:Dependencies:' . ucwords($dep_system));
@@ -678,7 +679,7 @@ function elgg_get_plugin_dependency_strings($dep) {
 		case 'elgg_release':
 			// 'Elgg Version'
 			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:Elgg');
-			$strings['value'] = "$comparison {$info['version']}";
+			$strings['expected_value'] = "$comparison {$info['version']}";
 			$strings['local_value'] = $dep['value'];
 			$strings['comment'] = '';
 			break;
@@ -687,10 +688,10 @@ function elgg_get_plugin_dependency_strings($dep) {
 			// PHP Extension %s [version]
 			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:PhpExtension', array($info['name']));
 			if ($info['version']) {
-				$strings['value'] = "$comparison {$info['version']}";
+				$strings['expected_value'] = "$comparison {$info['version']}";
 				$strings['local_value'] = $dep['value'];
 			} else {
-				$strings['value'] = '';
+				$strings['expected_value'] = '';
 				$strings['local_value'] = '';
 			}
 			$strings['comment'] = '';
@@ -698,17 +699,26 @@ function elgg_get_plugin_dependency_strings($dep) {
 
 		case 'php_ini':
 			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:PhpIni', array($info['name']));
-			$strings['value'] = "$comparison {$info['value']}";
+			$strings['expected_value'] = "$comparison {$info['value']}";
 			$strings['local_value'] = $dep['value'];
 			$strings['comment'] = '';
 			break;
 
 		case 'plugin':
 			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:Plugin', array($info['name']));
-			$strings['value'] = "$comparison {$info['version']}";
+			$strings['expected_value'] = "$comparison {$info['version']}";
 			$strings['local_value'] = $dep['version'];
 			$strings['comment'] = '';
 			break;
+
+		case 'priority':
+			$expected_priority = ucwords($info['priority']);
+			$real_priority = ucwords($dep['value']);
+			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:Priority');
+			$strings['expected_value'] = elgg_echo("ElggPlugin:Dependencies:Priority:$expected_priority", array($info['name']));
+			$strings['local_value'] =  elgg_echo("ElggPlugin:Dependencies:Priority:$real_priority", array($info['name']));
+			$strings['comment'] = '';
+			break;
 	}
 
 	if ($dep['status']) {
-- 
cgit v1.2.3