merged fix for MDL-7267, fixing keywords pivot

diff --git a/mod/glossary/print.php b/mod/glossary/print.php
index ced3023567d041b9c9f249128a1ace465179b557..c50038d9ed4af99b34347240797c6d7f6cd45a95 100644 (file)
--- a/mod/glossary/print.php
+++ b/mod/glossary/print.php
@@ -152,7 +152,7 @@
         foreach ($allentries as $entry) {
 
             // Setting the pivot for the current entry
-            $pivot = $entry->pivot;
+            $pivot = $entry->glossarypivot;
             $upperpivot = $textlib->strtoupper($pivot, current_charset());
             // Reduce pivot to 1cc if necessary
             if ( !$fullpivot ) {

diff --git a/mod/glossary/sql.php b/mod/glossary/sql.php
index 7b7db4f1b6cfe42689439c8c9f131294c3fbb99b..be4b2269b3b5a5f13aa817c8e25ece8afc1bdf4e 100644 (file)
--- a/mod/glossary/sql.php
+++ b/mod/glossary/sql.php
@@ -41,7 +41,7 @@
     case GLOSSARY_CATEGORY_VIEW:
         if ($hook == GLOSSARY_SHOW_ALL_CATEGORIES  ) { 
 
-            $sqlselect = "SELECT gec.id, ge.*, gec.entryid, gc.name $as pivot";
+            $sqlselect = "SELECT gec.id, ge.*, gec.entryid, gc.name $as glossarypivot";
             $sqlfrom   = "FROM {$CFG->prefix}glossary_entries ge,
                          {$CFG->prefix}glossary_entries_categories gec,
                          {$CFG->prefix}glossary_categories gc";
@@ -54,7 +54,7 @@
         } elseif ($hook == GLOSSARY_SHOW_NOT_CATEGORISED ) { 
 
             $printpivot = 0;
-            $sqlselect = "SELECT ge.*, concept $as pivot";
+            $sqlselect = "SELECT ge.*, concept $as glossarypivot";
             $sqlfrom   = "FROM {$CFG->prefix}glossary_entries ge LEFT JOIN {$CFG->prefix}glossary_entries_categories gec
                           ON ge.id = gec.entryid";
             $sqlwhere  = "WHERE (glossaryid = '$glossary->id' OR sourceglossaryid = '$glossary->id') AND
@@ -66,7 +66,7 @@
         } else {
 
             $printpivot = 0;
-            $sqlselect  = "SELECT ge.*, ce.entryid, c.name $as pivot";
+            $sqlselect  = "SELECT ge.*, ce.entryid, c.name $as glossarypivot";
             $sqlfrom    = "FROM {$CFG->prefix}glossary_entries ge, {$CFG->prefix}glossary_entries_categories ce, {$CFG->prefix}glossary_categories c";
             $sqlwhere   = "WHERE ge.id = ce.entryid AND ce.categoryid = '$hook' AND
                                  ce.categoryid = c.id AND ge.approved != 0 AND
@@ -103,7 +103,7 @@
             $where = '';
         }
 
-        $sqlselect  = "SELECT ge.id, $usernamefield $as pivot, u.id as uid, ge.*";
+        $sqlselect  = "SELECT ge.id, $usernamefield $as glossarypivot, u.id as uid, ge.*";
         $sqlfrom    = "FROM {$CFG->prefix}glossary_entries ge, {$CFG->prefix}user u";
         $sqlwhere   = "WHERE ge.userid = u.id  AND
                              (ge.approved != 0 $userid)
@@ -127,7 +127,7 @@
             }
         }
 
-        $sqlselect  = "SELECT ge.*, ge.concept $as pivot";
+        $sqlselect  = "SELECT ge.*, ge.concept $as glossarypivot";
         $sqlfrom    = "FROM {$CFG->prefix}glossary_entries ge";
         $sqlwhere   = "WHERE (ge.glossaryid = '$glossary->id' OR ge.sourceglossaryid = '$glossary->id') AND
                              ge.approved = 0 $where";
@@ -142,7 +142,7 @@
         $printpivot = 0;
     case GLOSSARY_STANDARD_VIEW:
     default:
-        $sqlselect  = "SELECT ge.*, ge.concept $as pivot";
+        $sqlselect  = "SELECT ge.*, ge.concept $as glossarypivot";
         $sqlfrom    = "FROM {$CFG->prefix}glossary_entries ge";
 
         $where = '';

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 604c13df3bf6632cde2b6a868cdc498307b7c501..be84f4341b0c7472fe57d81b78ebbdb7b60a6f41 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -335,7 +335,7 @@
         foreach ($allentries as $entry) {
 
             // Setting the pivot for the current entry
-            $pivot = $entry->pivot;
+            $pivot = $entry->glossarypivot;
             $upperpivot = $textlib->strtoupper($pivot, current_charset());
             // Reduce pivot to 1cc if necessary
             if ( !$fullpivot ) {