MDL-13103 merging from 1.9

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 34ce108b9247f2b4a3060615cb4690c6ec286e16..5bddcd3e9bcb196fb4db3b93fd1abc548dc10eac 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -926,6 +926,7 @@ $string['missingcountry'] = 'Missing country';
 $string['missingdescription'] = 'Missing description';
 $string['missingemail'] = 'Missing email address';
 $string['missingfirstname'] = 'Missing given name';
+$string['missingfromdisk'] = 'Missing from disk';
 $string['missingfullname'] = 'Missing full name';
 $string['missinglastname'] = 'Missing surname';
 $string['missingname'] = 'Missing name';

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 3fab604ee557c2251fc69b84d69571a745a15a02..fc9375ea9754222f4f410a104d2f9b1ad743a2e1 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -7826,5 +7826,44 @@ function object_array_unique($array, $keep_key_assoc = true) {
     return $keep_key_assoc ? $array : array_values($array);
 }
 
+/**
+ * Returns the language string for the given plugin.
+ * 
+ * @param string $plugin the plugin code name
+ * @param string $type the type of plugin (mod, block, filter)
+ * @return string The plugin language string
+ */
+function get_plugin_name($plugin, $type='mod') {
+    $plugin_name = '';
+
+    switch ($type) {
+        case 'mod': 
+            $plugin_name = get_string('modulename', $plugin);
+            break;
+        case 'blocks':
+            $plugin_name = get_string('blockname', "block_$plugin");
+            if (empty($plugin_name) || $plugin_name == '[[blockname]]') {
+                if (($block = block_instance($plugin)) !== false) {
+                    $plugin_name = $block->get_title();
+                } else {
+                    $plugin_name = "[[$plugin]]";
+                }
+            } 
+            break;
+        case 'filter':
+            $plugin_name = trim(get_string('filtername', $plugin));
+            if (empty($plugin_name) or ($plugin_name == '[[filtername]]')) {
+                $textlib = textlib_get_instance();
+                $plugin_name = $textlib->strtotitle($plugin);
+            } 
+            break;
+        default:
+            $plugin_name = $plugin;
+            break;
+    }
+
+    return $plugin_name;
+}
+
 // vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
 ?>

diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index 58ea88df245bd6e5901e9774924ea8829c387426..3ea5d38afdbd0f4e849e6485744bcccdd88c4df5 100644 (file)
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -327,6 +327,11 @@ table.flexible .r1 {
     font-weight: bold;
 }
 
+.plugincompattable td.missingplugin {
+    color: #FF7500;
+    font-weight: bold;
+}
+
 /* Admin settings */
 
 #adminsettings fieldset {