Fixed: base_host was not being used for urls

Updates #356
City-of-Bloomington · Mar 18, 2019 · 49c8860 · 49c8860
1 parent e0ed125
commit 49c8860
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/crm/blocks/html/reports/parameters.inc b/crm/blocks/html/reports/parameters.inc
@@ -14,7 +14,7 @@ use Application\Models\Person;
 use Blossom\Classes\Block;
 use Blossom\Classes\Url;
 
-$currentURL = new Url($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
+$currentURL = new Url(Url::current_url(BASE_HOST));
 ?>
 <div class="searchParameters">
 	<?php

diff --git a/crm/templates/html/helpers/Field.php b/crm/templates/html/helpers/Field.php
@@ -69,7 +69,7 @@ public function field(array $params)
 
         $attr = '';
         if (!empty(  $params['attr'])) {
-            foreach ($params['attr'] as $k=>$v) { $attr.= "$k=\"$v\""; }
+            foreach ($params['attr'] as $k=>$v) { $attr.= "$k=\"$v\" "; }
         }
 
         $input = $this->$renderInput($params, $required, $attr);
@@ -245,4 +245,4 @@ public function person(array $params, $required=null, $attr=null)
         $h = $this->template->getHelper('personChooser');
         return $h->personChooser($params['name'], $params['value']);
     }
-}
+}