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

diff --cc mod/data/field/url/field.class.php
index 38b7194,4220877..3b3641c
--- 1/mod/data/field/url/field.class.php
--- 2/mod/data/field/url/field.class.php
+++ b/mod/data/field/url/field.class.php
@@@ -63,9 -63,9 +63,9 @@@ class data_field_url extends data_field
              }
          }
  
-         $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) . '">';
 +        $str = '<div title="' . s($this->field->description) . '" class="form-inline">';
  
          $label = '<label for="' . $fieldid . '"><span class="accesshide">' . $this->field->name . '</span>';
          if ($this->field->required) {