From: skodak <skodak>
Date: Sun, 22 Oct 2006 19:42:27 +0000 (+0000)
Subject: fixed sql error when searching only by one letter and two radio buttons selected... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8a51efe99dbb11b82fc670778393f8c424838746;p=moodle.git

fixed sql error when searching only by one letter and two radio buttons selected at the same time (visible in Konqueror) fixed as part of MDL-7160 ; merged from MOODLE_17_STABLE
---

diff --git a/message/lib.php b/message/lib.php
index 2e9f3d88f2..52edb75e4c 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -754,6 +754,9 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none'
         }
     }
 
+    if ($messagesearch == '') { // if only 1 letter words searched
+        return false;
+    }
 
     $messagesearch = "($messagesearch) ";
 
diff --git a/message/search.html b/message/search.html
index 472fe2d3b4..a6b3d798fc 100644
--- a/message/search.html
+++ b/message/search.html
@@ -39,7 +39,7 @@
             <input type="checkbox" name="includeblocked" alt="<?php print_string('includeblockedusers', 'message') ?>" /><?php print_string('includeblockedusers', 'message') ?></td>
     </tr>
     
-    <tr><td>&nbsp;</td><td colspan="2"><input type="radio" name="keywordsoption" alt="<?php print_string('onlytome', 'message') ?>" value="tome" checked="checked" /><?php print_string('onlytome', 'message') ?></td></tr>
+    <tr><td>&nbsp;</td><td colspan="2"><input type="radio" name="keywordsoption" alt="<?php print_string('onlytome', 'message') ?>" value="tome" /><?php print_string('onlytome', 'message') ?></td></tr>
     <tr><td>&nbsp;</td><td colspan="2"><input type="radio" name="keywordsoption" alt="<?php print_string('onlyfromme', 'message') ?>" value="fromme" /><?php print_string('onlyfromme', 'message') ?></td></tr>
     <tr><td>&nbsp;</td><td colspan="2"><input type="radio" checked="checked" name="keywordsoption" alt="<?php print_string('allmine', 'message') ?>" value="allmine" /><?php print_string('allmine', 'message') ?></td></tr>