Merge branch 'MDL-54871' of https://github.com/bostelm/moodle

mod/data/field/url/field.class.php

@@ -63,7 +63,7 @@ class data_field_url extends data_field_base {
             }
         }
 
-        $autolinkable = !empty($this->field->param1) and empty($this->field->param2);
+        $autolinkable = !empty($this->field->param1) && empty($this->field->param2);
 
         $str = '<div title="' . s($this->field->description) . '" class="form-inline">';