- Removing some Notices.. Thanks to Eloy for leting me know!

diff --git a/mod/glossary/dynalink.php b/mod/glossary/dynalink.php
index c6aa521be6ccd05991ebc775fda130c78d35fd58..fc6c3faef490cbfd40fa4a6ab4d1bad79393e063 100644 (file)
--- a/mod/glossary/dynalink.php
+++ b/mod/glossary/dynalink.php
@@ -47,6 +47,7 @@
             if ( isset($concepts) ) {
                 $lastglossary = 0;
                 $lastcategory = 0;                
+                $cm = '';
                 foreach ( $concepts as $concept ) {
                     if ( $concept->category ) {
                         if ( $lastcategory != $concept->id ) {

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 8a86eb35d98f01634d55d4779745e3e8e1ade76b..8a8be2f83af52f6dcd2f121a1c023bd59625e02f 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1176,7 +1176,12 @@ global $CFG;
 
      $sicon     = '';
      $sneworder = '';
-     $stag      = '';
+
+     $sbtag      = '';
+     $fbtag      = '';
+     $fendbtag      = '';
+     $sendbtag      = '';
+
      $sendbtag  = '';
 
      if ( $sortkey == 'CREATION' or $sortkey == 'FIRSTNAME' ) {

diff --git a/mod/glossary/sql.php b/mod/glossary/sql.php
index 0694abb4ef758003186daf258c2e8c4ccce2cb15..46b90b67ac148d49e47f94af8c6d61fff58d6958 100644 (file)
--- a/mod/glossary/sql.php
+++ b/mod/glossary/sql.php
@@ -22,6 +22,7 @@
         $sqlsortkey = "timemodified";
     break;
     }
+    $sqlsortorder = $sortorder;
 
     $fullpivot = 1;
 

diff --git a/mod/glossary/tabs.html b/mod/glossary/tabs.html
index 32010b969aae20e5e08a40c0658ae080e165f3bc..c66f79223863d26edfdba595e8dcec9975cd0725 100644 (file)
--- a/mod/glossary/tabs.html
+++ b/mod/glossary/tabs.html
@@ -101,8 +101,8 @@
         case GLOSSARY_STANDARD_VIEW:
         default:
             glossary_print_alphabet_menu($cm, $glossary, "letter", $hook, $sortkey, $sortorder);
-            if ($search) {
-                echo "<h3>$strsearch: $search</h3>";
+            if ($mode == 'search' and $hook) {
+                echo "<h3>$strsearch: $hook</h3>";
             } 
         break;
     } 

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 54923090a578afd4f020109317d56e124002eb20..458593c07bfb2a6f89af02c0bd4059324c0d59df 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -240,6 +240,7 @@
 /// printing the entries
     $entriesshown = 0;
     $currentpivot = '';
+    $tableisopen = 0;
     if ( $hook == 'SPECIAL' ) {
         $alphabet = explode(",", get_string("alphabet"));
     }