From a77aaef267d984dfcb99da9812b02db6d62afc2b Mon Sep 17 00:00:00 2001 From: stronk7 Date: Sat, 14 Jun 2008 00:00:26 +0000 Subject: [PATCH] Fix some missing $this-> in ddl/dml stuff. MDL-15236 --- lib/dml/moodle_database.php | 2 +- lib/dml/mssql_adodb_moodle_database.php | 4 ++-- lib/dml/oci8po_adodb_moodle_database.php | 4 ++-- lib/dml/postgres7_adodb_moodle_database.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php index 93e5cd88aa..27cbe34c36 100644 --- 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 79f7ae73b3..655a38029b 100644 --- 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 cfb3e46333..ecf358fedf 100644 --- 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 08e40d1375..c16299df90 100644 --- 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) { -- 2.39.5