Fixed a problem with detecting conflicting plugin versions. Not showing a stray...

git-svn-id: http://code.elgg.org/elgg/trunk@8022 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index cf0ac5af167824a95f0c858066920329bb6870fd..5cb6d23f67c43f819a801c45bbc42c3b6f5cb2cb 100644 (file)
--- 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;