Changed some parameters. SC#33.

Merged from MOODLE_14_STABLE

diff --git a/mod/glossary/print.php b/mod/glossary/print.php
index 1bd38bac7a2c6734571ba40e60876bc1bd35dec2..538a099a6843c2b8b89199db1281d984e47e2793 100644 (file)
--- a/mod/glossary/print.php
+++ b/mod/glossary/print.php
@@ -7,7 +7,7 @@
     
     require_variable($id);                         // Course Module ID
     optional_variable($sortorder,"asc");           // Sorting order 
-    optional_variable($offset);                    // number of entries to bypass
+    optional_variable($offset,0,PARAM_INT);        // number of entries to bypass
     optional_variable($displayformat,-1); 
 
     $mode    = required_param('mode');             // mode to show the entries

diff --git a/mod/glossary/sql.php b/mod/glossary/sql.php
index e578be30a457a55e71f7f800b22559594cac36a7..8ad7ea961b84abd24b9d14caafe781297db9f0ed 100644 (file)
--- a/mod/glossary/sql.php
+++ b/mod/glossary/sql.php
@@ -9,6 +9,9 @@
 
 /// Creating the SQL statements
 
+/// Initialise some variables
+    $sqlorderby = '';
+
 /// Pivot is the field that set the break by groups (category, initial, author name, etc)
 
 /// fullpivot indicate if the whole pivot should be compared agasint the db or just the first letter
@@ -182,7 +185,7 @@
 
         case 'entry': 
             $printpivot = 0;
-            $where = "AND ge.id = $hook";
+            $where = "AND ge.id = '$hook'";
         break;
 
         case 'letter': 

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 3a7915f8bca22c52d92f8571fbd7fc2da862827b..3ce65b107d6ebe087b189c5d43c22233678d93ef 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -20,8 +20,8 @@
     $fullsearch = optional_param('fullsearch',0);// full search (concept and definition) when searching?
     $sortkey    = optional_param('sortkey');     // Sorted view: CREATION | UPDATE | FIRSTNAME | LASTNAME...
     $sortorder  = optional_param('sortorder');   // it defines the order of the sorting (ASC or DESC)
-    $offset     = optional_param('offset',0);    // entries to bypass (for paging purpouses)
-    $page       = optional_param('page',0);      // Page to show (for paging purpouses)
+    $offset     = optional_param('offset',0,PARAM_INT);    // entries to bypass (for paging purpouses)
+    $page       = optional_param('page',0,PARAM_INT);      // Page to show (for paging purpouses)
     $show       = optional_param('show');        // [ concept | alias ] => mode=term hook=$show
 
     if (!empty($id)) {