From a9cda870ba8d68397a2dd97ede7c84d0db67f870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Fri, 7 Jun 2013 17:26:01 +0200
Subject: [PATCH] MDL-38109 use always get_plugin_list() to get list of plugins

get_list_of_plugins() is NOT intended for real plugins, only plugin like directories.
---
 lib/filterlib.php      | 4 ++--
 mod/assignment/lib.php | 4 ++--
 mod/data/field.php     | 6 +++---
 mod/data/lib.php       | 5 ++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/filterlib.php b/lib/filterlib.php
index a01de832c01..946c7cf9a93 100644
--- a/lib/filterlib.php
+++ b/lib/filterlib.php
@@ -513,8 +513,8 @@ function filter_get_all_installed() {
     global $CFG;
 
     $filternames = array();
-    foreach (get_list_of_plugins('filter') as $filter) {
-        if (is_readable("$CFG->dirroot/filter/$filter/filter.php")) {
+    foreach (get_plugin_list('filter') as $filter => $fulldir) {
+        if (is_readable("$fulldir/filter.php")) {
             $filternames[$filter] = filter_get_name($filter);
         }
     }
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 8ea3937027f..ba560cff26c 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -3820,8 +3820,8 @@ function assignment_get_types() {
     }
 
     /// Drop-in extra assignment types
-    $assignmenttypes = get_list_of_plugins('mod/assignment/type');
-    foreach ($assignmenttypes as $assignmenttype) {
+    $assignmenttypes = get_plugin_list('assignment');
+    foreach ($assignmenttypes as $assignmenttype=>$fulldir) {
         if (!empty($CFG->{'assignment_hide_'.$assignmenttype})) {  // Not wanted
             continue;
         }
diff --git a/mod/data/field.php b/mod/data/field.php
index 7b5445005b7..4a08a41118f 100644
--- a/mod/data/field.php
+++ b/mod/data/field.php
@@ -240,11 +240,11 @@ switch ($mode) {
 /// Print the browsing interface
 
 ///get the list of possible fields (plugins)
-$directories = get_list_of_plugins('mod/data/field/');
+$plugins = get_plugin_list('datafield');
 $menufield = array();
 
-foreach ($directories as $directory){
-    $menufield[$directory] = get_string($directory,'data');    //get from language files
+foreach ($plugins as $plugin=>$fulldir){
+    $menufield[$plugin] = get_string('pluginname', 'datafield_'.$plugin);    //get from language files
 }
 asort($menufield);    //sort in alphabetical order
 $PAGE->set_title(get_string('course') . ': ' . $course->fullname);
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 653f251fd5d..46a260ca6c0 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1877,9 +1877,8 @@ function data_get_available_presets($context) {
     $presets = array();
 
     // First load the ratings sub plugins that exist within the modules preset dir
-    if ($dirs = get_list_of_plugins('mod/data/preset')) {
-        foreach ($dirs as $dir) {
-            $fulldir = $CFG->dirroot.'/mod/data/preset/'.$dir;
+    if ($dirs = get_plugin_list('datapreset')) {
+        foreach ($dirs as $dir=>$fulldir) {
             if (is_directory_a_preset($fulldir)) {
                 $preset = new stdClass();
                 $preset->path = $fulldir;