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

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 861e5fdc782781498671573fffdbe4cfb78098e4..d7664bf9f4775efc112780a24023304c6559f30c 100755 (executable)
--- 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 . '&rid=' . $record->id;
-        $search && $moreurl .= '&filter=1';
+        if ($search) {
+            $moreurl .= '&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 dd1b690c7a6779753ed4eca559a864139b787af6..c1298b8ae9a307026d589fd7597356a142151b30 100755 (executable)
--- 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) {