From fc6dfc94fdfa990d0861619949e2ae7682c450f0 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Fri, 15 Jul 2016 09:50:52 +0200
Subject: [PATCH] Fixes #93, use Moodle's SQL limit func
---
classes/results.php | 10 +++++-----
mod_form.php | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/classes/results.php b/classes/results.php
index ccb22e5..ee969ff 100644
--- a/classes/results.php
+++ b/classes/results.php
@@ -161,9 +161,9 @@ class results {
{$join}
{$where}
{$order_by}
- LIMIT {$this->limit}
- OFFSET {$this->offset}
- ", $args);
+ ", $args,
+ $this->offset,
+ $this->limit);
}
/**
@@ -312,8 +312,8 @@ class results {
* @param array $args Used for placeholders
* @return array
*/
- protected function get_sql_results($query, $args) {
+ protected function get_sql_results($query, $args, $limitfrom = 0, $limitnum = 0) {
global $DB;
- return $DB->get_records_sql($query, $args);
+ return $DB->get_records_sql($query, $args, $limitfrom, $limitnum);
}
}
diff --git a/mod_form.php b/mod_form.php
index 62f8f37..c3b5513 100644
--- a/mod_form.php
+++ b/mod_form.php
@@ -121,7 +121,7 @@ class mod_hvp_mod_form extends moodleform_mod {
}
// Determine default action
- if ($content === null && $DB->get_field_sql("SELECT id FROM {hvp_libraries} WHERE runnable = 1 LIMIT 1") === false) {
+ if ($content === null && $DB->get_field_sql("SELECT id FROM {hvp_libraries} WHERE runnable = 1", null, IGNORE_MULTIPLE) === false) {
$defaultvalues['h5paction'] = 'upload';
}
--
GitLab