Fixed problems showing detected values for plugin conflicts. Clarified language for...

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

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index e61874ebc425ee39234d8aa1331909cfe3e51c6f..01cbf631a57253183c43d1227f1a12c3428f6079 100644 (file)
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -707,7 +707,7 @@ 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']}";
-                       $strings['local_value'] = $dep['version'];
+                       $strings['local_value'] = $dep['value'];
                        $strings['comment'] = '';
                        break;
 

diff --git a/languages/en.php b/languages/en.php
index 3d4484e2e1c58bfc88d757c948858ac9bd94c86d..406679d5898cbf89fdb48fa21d6f6c77378490d0 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -602,7 +602,7 @@ $english = array(
 
        'admin:plugins:dependencies:type' => 'Type',
        'admin:plugins:dependencies:name' => 'Name',
-       'admin:plugins:dependencies:expected_value' => 'Expected Value',
+       'admin:plugins:dependencies:expected_value' => 'Tested Value',
        'admin:plugins:dependencies:local_value' => 'Actual value',
        'admin:plugins:dependencies:comment' => 'Comment',
 

diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index ff1abee1e956a7b45a6ce555e9e556ed0d6fa071..4c6a8b756592f8c6c25ced137a757cf6ff4ee519 100644 (file)
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -185,7 +185,7 @@ if (elgg_view_exists($settings_view)) {
 
                if (!$can_activate) {
                        $message = elgg_echo('admin:plugins:warning:unmet_dependencies');
-                       echo "<p class=\"plugin-cannot-activate\">$message</p>";
+                       echo "<p class=\"elgg-unsatisfied-dependency\">$message</p>";
                }
                ?>