aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-05 02:25:08 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-05 02:25:08 +0000
commita05e685b79a3c0978972eeb296d1b22800ff2114 (patch)
treed998fd88daa15d506107255d4ba6b30ce3e367b3
parent2062a91d9ca2f31ccf4cd1eaa338c5190bffe56d (diff)
downloadelgg-a05e685b79a3c0978972eeb296d1b22800ff2114.tar.gz
elgg-a05e685b79a3c0978972eeb296d1b22800ff2114.tar.bz2
Fixed a problem with detecting conflicting plugin versions. Not showing a stray = when versions aren't specified in conflicts and requires.
git-svn-id: http://code.elgg.org/elgg/trunk@8022 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/plugins.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index cf0ac5af1..5cb6d23f6 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -609,7 +609,6 @@ function elgg_check_plugins_provides($type, $name, $version = null, $comparison
}
if ($provided) {
- $version = $provided['version'];
if ($version) {
$status = version_compare($provided['version'], $version, $comparison);
} else {
@@ -619,7 +618,7 @@ function elgg_check_plugins_provides($type, $name, $version = null, $comparison
return array(
'status' => $status,
- 'value' => $version
+ 'value' => $provided['version']
);
}
@@ -706,7 +705,8 @@ function elgg_get_plugin_dependency_strings($dep) {
case 'plugin':
$strings['name'] = elgg_echo('ElggPlugin:Dependencies:Plugin', array($info['name']));
- $strings['expected_value'] = "$comparison {$info['version']}";
+ $expected = $info['version'] ? "$comparison {$info['version']}" : '';
+ $strings['expected_value'] = $expected;
$strings['local_value'] = $dep['value'];
$strings['comment'] = '';
break;