From e19a635c98e2a2ac44f2c70f42e868e60a4590d6 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Fri, 25 Feb 2005 12:36:27 +0000
Subject: [PATCH] Removing the old <nolink> tags. In some cases using both
 <span class="nolink"> and <nolink> together was causing some problems. (SE)

---
 mod/glossary/formats/encyclopedia/encyclopedia_format.php | 1 +
 .../formats/fullwithauthor/fullwithauthor_format.php      | 2 +-
 .../fullwithoutauthor/fullwithoutauthor_format.php        | 2 +-
 mod/glossary/lib.php                                      | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
index c307bf5266a..448d6754dc5 100644
--- a/mod/glossary/formats/encyclopedia/encyclopedia_format.php
+++ b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
@@ -75,6 +75,7 @@ function glossary_print_entry_encyclopedia($course, $cm, $glossary, $entry, $mod
     $entry->definition = '<span class="nolink">'.$entry->definition.'</span>';
 
     //Call to view function (without icons, ratings and aliases) and return its result
+    
     return glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode, $hook, false, false, false);
 
 }
diff --git a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
index 6643ddc794e..79d14c88e38 100644
--- a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
+++ b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
@@ -62,7 +62,7 @@ function glossary_print_entry_fullwithauthor($course, $cm, $glossary, $entry, $m
     //The print view for this format is exactly the normal view, so we use it
 
     //Take out autolinking in definitions un print view
-    $entry->definition = '<nolink>'.$entry->definition.'</nolink>';
+    $entry->definition = '<span class="nolink">'.$entry->definition.'</span>';
 
     //Call to view function (without icons, ratings and aliases) and return its result
     return glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mode, $hook, false, false, false);
diff --git a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
index 0bd7fc6a825..4b72331c175 100644
--- a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
+++ b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
@@ -51,7 +51,7 @@ function glossary_print_entry_fullwithoutauthor($course, $cm, $glossary, $entry,
     //The print view for this format is exactly the normal view, so we use it
 
     //Take out autolinking in definitions un print view
-    $entry->definition = '<nolink>'.$entry->definition.'</nolink>';
+    $entry->definition = '<span class="nolink">'.$entry->definition.'</span>';
 
     //Call to view function (without icons, ratings and aliases) and return its result
     return glossary_show_entry_fullwithoutauthor($course, $cm, $glossary, $entry, $mode, $hook, false, false, false);
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index b30cc9489cf..19a97ced1b5 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -589,14 +589,14 @@ function glossary_print_entry($course, $cm, $glossary, $entry, $mode='',$hook=''
 function glossary_print_entry_default ($entry) {
     echo '<b>'. strip_tags($entry->concept) . ': </b>';
     $options->para = false;
-    $definition = format_text('<nolink>' . strip_tags($entry->definition) . '</nolink>', $entry->format,$options);
+    $definition = format_text('<span class="nolink">' . strip_tags($entry->definition) . '</span>', $entry->format,$options);
     echo ($definition);
     echo '<br /><br />';
 }
 
 function  glossary_print_entry_concept($entry) {
     $options->para = false;
-    $text = format_text('<nolink>' . $entry->concept . '</nolink>', FORMAT_MOODLE, $options);
+    $text = format_text('<span class="nolink">' . $entry->concept . '</span>', FORMAT_MOODLE, $options);
     if (!empty($entry->highlight)) {
         $text = highlight($entry->highlight, $text);
     }
@@ -665,8 +665,8 @@ function glossary_print_entry_definition($entry) {
     }
 
     //Put doNolinks (concept + aliases) enclosed by <nolink> tag
-    $definition= preg_replace($doNolinks,'<nolink>$1</nolink>',$definition);
-        
+    $definition= preg_replace($doNolinks,'<span class="nolink">$1</span>',$definition);
+
     //Restore addrs
     if ( $addrs ) {
         $definition = str_replace(array_keys($addrs),$addrs,$definition);