proper initialisation of sqlsortkey SC#258; merged from MOODLE_16_STABLE

diff --git a/mod/glossary/sql.php b/mod/glossary/sql.php
index e494176efff60435ca2e920894ffc78cedaeecb7..1d9a8228607c08c6221c167390763f4c7645186a 100644 (file)
--- a/mod/glossary/sql.php
+++ b/mod/glossary/sql.php
@@ -11,6 +11,7 @@
 
 /// Initialise some variables
     $sqlorderby = '';
+    $sqlsortkey = NULL;
 
 /// Pivot is the field that set the break by groups (category, initial, author name, etc)
 
@@ -84,10 +85,6 @@
     break;
     case GLOSSARY_AUTHOR_VIEW:
 
-        if (!isset($sqlsortkey)) {
-            $sqlsortkey = NULL;
-        }
-
         $where = '';
         switch ($CFG->dbtype) {
         case 'postgres7':
@@ -124,10 +121,6 @@
         $fullpivot = 0;
         $printpivot = 0;
 
-        if (!isset($sqlsortkey)) {
-            $sqlsortkey = NULL;
-        }
-
         $where = '';
         if ($hook != 'ALL' and $hook != 'SPECIAL') {
             switch ($CFG->dbtype) {