From: stronk7 <stronk7>
Date: Tue, 18 Nov 2008 00:10:13 +0000 (+0000)
Subject: MDL-15425 Coding style: Change some logical operator uses. Thanks Robert! Merged... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=32d799c683355557c5d5c77624c6da8b7b299575;p=moodle.git

MDL-15425 Coding style: Change some logical operator uses. Thanks Robert! Merged from 19_STABLE
---

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 861e5fdc78..d7664bf9f4 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1012,7 +1012,9 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
         }
 
         $moreurl = $CFG->wwwroot . '/mod/data/view.php?d=' . $data->id . '&amp;rid=' . $record->id;
-        $search && $moreurl .= '&amp;filter=1';
+        if ($search) {
+            $moreurl .= '&amp;filter=1';
+        }
         $patterns[]='##more##';
         $replacement[] = '<a href="' . $moreurl . '"><img src="' . $CFG->pixpath . '/i/search.gif" class="iconsmall" alt="' . get_string('more', 'data') . '" title="' . get_string('more', 'data') . '" /></a>';
 
diff --git a/mod/data/view.php b/mod/data/view.php
index dd1b690c7a..c1298b8ae9 100755
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -225,7 +225,9 @@
     }
 
     // Disable search filters if $filter is not true:
-    $filter || $search = '';
+    if (! $filter) {
+        $search = '';
+    }
 
     $textlib = textlib_get_instance();
     if ($textlib->strlen($search) < 2) {