"REPOSITORY/MDL-17466, display which plugin is valid"

diff --git a/admin/repository.php b/admin/repository.php
index bed5871340ea14253998241001f38cfc88790067..66ba289e9f3e467b7ff00a426930fa0c8bfd0e4a 100644 (file)
--- a/admin/repository.php
+++ b/admin/repository.php
@@ -135,9 +135,9 @@ if (!empty($edit) || !empty($new)) {
         print_error('confirmsesskeybad', '', $baseurl);
     }
     $repositorytype = repository::get_type_by_typename($hide);
+    $repositorytype = '';
     if (empty($repositorytype)) {
-        print_error('invalidplugin', 'repository');
-
+        print_error('invalidplugin', 'repository', '', $hide);
     }
     $repositorytype->switch_and_update_visibility();
     $return = true;

diff --git a/lang/en_utf8/repository.php b/lang/en_utf8/repository.php
index 99a69511938252067956b1a4b0887c98b3ff7570..98a2cbe3645bfd494a57b6254aca60a56c365746 100644 (file)
--- a/lang/en_utf8/repository.php
+++ b/lang/en_utf8/repository.php
@@ -50,7 +50,7 @@ $string['instance'] = 'instance';
 $string['instancedeleted'] = 'Instance deleted';
 $string['instances'] = 'Repository instances';
 $string['invalidrepositoryid'] = 'Invalid repository ID';
-$string['invalidplugin'] = 'Invalid repository plug-in';
+$string['invalidplugin'] = 'Invalid repository $a plug-in';
 $string['invalidjson'] = 'Invalid JSON string';
 $string['listview'] = 'View as list';
 $string['login'] = 'Login';

diff --git a/repository/ws.php b/repository/ws.php
index bda2dfdb657aa858cd931caa4ed6c1fd59d186ba..fb6f96d54285c78bf825dc3e11a4bb5fc7f074b0 100644 (file)
--- a/repository/ws.php
+++ b/repository/ws.php
@@ -105,7 +105,7 @@
         }
     } else {
         $err = new stdclass;
-        $err->e = get_string('invalidplugin', 'repository');
+        $err->e = get_string('invalidplugin', 'repository', $type);
         die(json_encode($err));
     }