MDL-24425 mnet: fixed SQL DISTINCT from a table containing text field

diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index 2faf62d..ef5d636 100644 (file)
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -1241,7 +1241,7 @@ class auth_plugin_mnet extends auth_plugin_base {
         global $DB, $CFG;
         // strip off wwwroot, since the remote site will prefix it's return url with this
         $wantsurl = preg_replace('/(' . preg_quote($CFG->wwwroot, '/') . '|' . preg_quote($CFG->httpswwwroot, '/') . ')/', '', $wantsurl);
         global $DB, $CFG;
         // strip off wwwroot, since the remote site will prefix it's return url with this
         $wantsurl = preg_replace('/(' . preg_quote($CFG->wwwroot, '/') . '|' . preg_quote($CFG->httpswwwroot, '/') . ')/', '', $wantsurl);

-        if (!$hosts = $DB->get_records_sql('SELECT DISTINCT h.*, a.sso_jump_url,a.name as application
+        if (!$hosts = $DB->get_records_sql('SELECT DISTINCT h.id, h.wwwroot, h.name, a.sso_jump_url,a.name as application

                 FROM {mnet_host} h
                 JOIN {mnet_host2service} m ON h.id=m.hostid
                 JOIN {mnet_service} s ON s.id=m.serviceid
                 FROM {mnet_host} h
                 JOIN {mnet_host2service} m ON h.id=m.hostid
                 JOIN {mnet_service} s ON s.id=m.serviceid