Glossary now gets the alphabet string from moodle.php instead of glossary.php

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 0374145d18955a2497092b3a7197b9b54039a70a..eeff9a7b928473d2afab8646c2df4fc913a28b06 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -953,7 +953,7 @@ global $CFG;
 function glossary_print_alphabet_links($cm, $glossary,$l, $tab) {
 global $CFG;
      if ( $glossary->showalphabet and $glossary->displayformat != GLOSSARY_FORMAT_CONTINUOUS ) {
-          $alphabet = explode("|", get_string("alphabet","glossary"));
+          $alphabet = explode(",", get_string("alphabet"));
           $letters_by_line = 14;
           for ($i = 0; $i < count($alphabet); $i++) {
               if ( $l == $alphabet[$i] and $l) {
@@ -1271,4 +1271,4 @@ function glossary_check_dir_exists($dir,$create=false) {
     }
     return $status;
 }
-?>
\ No newline at end of file
+?>

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 664b088907393ec738848eb2b0baa50cb871100c..9f1a2f619f4e40c67e2f015876e08d9bddbddcde 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -97,7 +97,7 @@
         $search = '';
     } 
 
-    $alphabet = explode('|', get_string("alphabet","glossary"));
+    $alphabet = explode(',', get_string("alphabet"));
     if ($l == '' and $search == '' and !$eid) {
         // if the user is just entering the glossary...
         if ($tab != GLOSSARY_APPROVAL_VIEW) {