Solve some upperpivot notices and wrong behaviours. More coming...

diff --git a/mod/glossary/print.php b/mod/glossary/print.php
index 152f6cc49f4584e3ab2e3c01528c6e58ec54e6fe..b4e4b32c8ac57f36473646c6fe93d50cef0f24b8 100644 (file)
--- a/mod/glossary/print.php
+++ b/mod/glossary/print.php
@@ -152,9 +152,10 @@
 
             // Setting the pivot for the current entry
             $pivot = $entry->pivot;
+            $upperpivot = $textlib->strtoupper($pivot, current_charset());
+            // Reduce pivot to 1cc if necessary
             if ( !$fullpivot ) {
-                $pivot = $textlib->substr($pivot, 0, 1, current_charset());
-                $upperpivot = $textlib->strtoupper($pivot, current_charset());
+                $upperpivot = $textlib->substr($upperpivot, 0, 1, current_charset());
             }            
             
             // If there's  group break

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index bd88ef1c33311f74c80d51af7ce718e3e2fe0082..71362cd218e3be49cca399b2902255d22a650d62 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -332,14 +332,15 @@
 
         foreach ($allentries as $entry) {
 
-            /// Setting the pivot for the current entry
+            // Setting the pivot for the current entry
             $pivot = $entry->pivot;
+            $upperpivot = $textlib->strtoupper($pivot, current_charset());
+            // Reduce pivot to 1cc if necessary
             if ( !$fullpivot ) {
-                $pivot = $textlib->substr($pivot, 0, 1, current_charset());
-                $upperpivot = $textlib->strtoupper($pivot, current_charset());
+                $upperpivot = $textlib->substr($upperpivot, 0, 1, current_charset());
             }            
             
-            /// if there's a group break
+            // if there's a group break
             if ( $currentpivot != $upperpivot ) {
 
                 // print the group break if apply