Fix some missing $this-> in ddl/dml stuff. MDL-15236

diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index 93e5cd88aa064a4efce92572e33631d8debb271e..27cbe34c367c8f271c542cbc9bd7e0b816161c32 100644 (file)
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -516,7 +516,7 @@ abstract class moodle_database {
             }
         }
         $select = implode(" AND ", $select);
-        return get_recordset_select($table, $select, $params, $sort, $fields, $limitfrom, $limitnum);
+        return $this->get_recordset_select($table, $select, $params, $sort, $fields, $limitfrom, $limitnum);
     }
 
     /**

diff --git a/lib/dml/mssql_adodb_moodle_database.php b/lib/dml/mssql_adodb_moodle_database.php
index 79f7ae73b39af938a004aa2043c3a15ad33edda4..655a38029b4e316dec8adb0e0222f8b0f8a0a410 100644 (file)
--- a/lib/dml/mssql_adodb_moodle_database.php
+++ b/lib/dml/mssql_adodb_moodle_database.php
@@ -115,7 +115,7 @@ class mssql_adodb_moodle_database extends adodb_moodle_database {
         if (!$text) {
             return ' CAST(' . $fieldname . ' AS INT) ';
         } else {
-            return ' CAST(' . sql_compare_text($fieldname) . ' AS INT) ';
+            return ' CAST(' . $this->sql_compare_text($fieldname) . ' AS INT) ';
         }
     }
 
@@ -125,7 +125,7 @@ class mssql_adodb_moodle_database extends adodb_moodle_database {
 
     public function sql_isempty($tablename, $fieldname, $nullablefield, $textfield) {
         if ($textfield) {
-            return sql_compare_text($fieldname)." = '' ";
+            return $this->sql_compare_text($fieldname)." = '' ";
         } else {
             return " $fieldname = '' ";
         }

diff --git a/lib/dml/oci8po_adodb_moodle_database.php b/lib/dml/oci8po_adodb_moodle_database.php
index cfb3e46333be0a36727a69bc67727869a2bb88aa..ecf358fedf7cb665689378e18bdf3a9301650396 100644 (file)
--- a/lib/dml/oci8po_adodb_moodle_database.php
+++ b/lib/dml/oci8po_adodb_moodle_database.php
@@ -158,7 +158,7 @@ class oci8po_adodb_moodle_database extends adodb_moodle_database {
     }
 
     public function sql_bitor($int1, $int2) {
-        return '((' . $int1 . ') + (' . $int2 . ') - ' . sql_bitand($int1, $int2) . ')';
+        return '((' . $int1 . ') + (' . $int2 . ') - ' . $this->sql_bitand($int1, $int2) . ')';
     }
 
     public function sql_bitxor($int1, $int2) {
@@ -169,7 +169,7 @@ class oci8po_adodb_moodle_database extends adodb_moodle_database {
         if (!$text) {
             return ' CAST(' . $fieldname . ' AS INT) ';
         } else {
-            return ' CAST(' . sql_compare_text($fieldname) . ' AS INT) ';
+            return ' CAST(' . $this->sql_compare_text($fieldname) . ' AS INT) ';
         }
     }
 

diff --git a/lib/dml/postgres7_adodb_moodle_database.php b/lib/dml/postgres7_adodb_moodle_database.php
index 08e40d1375afcf49ee94f9989dc884c023577ace..c16299df900060aa7f096b8253af14d7516cafcf 100644 (file)
--- a/lib/dml/postgres7_adodb_moodle_database.php
+++ b/lib/dml/postgres7_adodb_moodle_database.php
@@ -418,7 +418,7 @@ class postgres7_adodb_moodle_database extends adodb_moodle_database {
     }
 
     public function sql_bitxor($int1, $int2) {
-        return '(' . sql_bitor($int1, $int2) . ' - ' . sql_bitand($int1, $int2) . ')';
+        return '(' . $this->sql_bitor($int1, $int2) . ' - ' . $this->sql_bitand($int1, $int2) . ')';
     }
 
     public function sql_cast_char2int($fieldname, $text=false) {