From: martinlanghoff <martinlanghoff>
Date: Thu, 4 Jan 2007 03:31:10 +0000 (+0000)
Subject: admin/mnet/mnet_services:  Concatenated query to sidestep Moodle
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=42f735391116672009dc800a463ddc7f5970c748;p=moodle.git

admin/mnet/mnet_services:  Concatenated query to sidestep Moodle
requirement that firest field of resultset is unique


Author: Donal McMullan <donal@catalyst.net.nz>
---

diff --git a/admin/mnet/mnet_services.php b/admin/mnet/mnet_services.php
index 9f131f0a4a..b90f43fbe7 100644
--- a/admin/mnet/mnet_services.php
+++ b/admin/mnet/mnet_services.php
@@ -74,9 +74,11 @@
             $id_list .= ', '.$CFG->mnet_all_hosts_id;
         }
 
+        $concat = sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id');
+
         $query = "
             SELECT DISTINCT
-                h2s.id,
+                $concat as id,
                 svc.id as serviceid,
                 svc.name,
                 svc.offer,