MDL-15701 Merged fix for showing just non-deleted hosts, from 1.9

diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php
index 2978bd4accfd8328714f87cb697838eea690a073..002aa824a0269814de46d41c4aa2082333e85cb8 100644 (file)
--- a/blocks/mnet_hosts/block_mnet_hosts.php
+++ b/blocks/mnet_hosts/block_mnet_hosts.php
@@ -60,6 +60,7 @@ class block_mnet_hosts extends block_list {
              WHERE
                  h.id <> ? AND
                  h.id = h2s_IDP.hostid AND
+                 h.deleted = 0 AND
                  h.applicationid = a.id AND
                  h2s_IDP.serviceid = s_IDP.id AND
                  s_IDP.name = 'sso_idp' AND