Merge commit '0ca5fea0cc893684982894e474a00176853535e6' into cweiske

* commit '0ca5fea0cc893684982894e474a00176853535e6':
  fix missing space in company address
  hide counter reset
  support non-http URLs in labeledURI fields (e.g. xmpp or mailto)
  support multiple URLs

Conflicts:
	inc/functions.php

diff --cc inc/functions.php
index 301148c63b91a53693e4cf6f29e3667dd3b54297,add970ca8bcb73c58ac51673fedb40c84698e664..2032a037e9a888e57c3d4361d7fd85dbd5e557dd
--- 1/inc/functions.php
--- 2/inc/functions.php
+++ b/inc/functions.php
@@@ -526,4 -526,24 +526,3 @@@ function get_fields_from_template($tpl)
      return $return;
  }
  
 -function addCoords(&$coords, $entry, $geocoder)
 -{
 -    $priv = $geocoder->getPrivateCoords($entry);
 -    if ($priv !== null) {
 -        $priv->address = '<b>'
 -            . $entry['givenname'] . ' ' . $entry['name'] . '</b><br/>'
 -            . str_replace("\n", '<br/>', $entry['homestreet']);
 -        $coords[] = $priv;
 -    }
 -
 -    $busi = $geocoder->getBusinessCoords($entry);
 -    if ($busi !== null) {
 -        $busi->address = '<b>' . $entry['organization'] . '<br/>'
 -            . $entry['givenname'] . ' ' . $entry['name'] . '</b><br/>'
 -            . $entry['street'] . '<br/>'
 -            . $entry['zip'] . ' ' . $entry['location'];
 -        $coords[] = $busi;
 -    }
 -}
 -
--?>

diff --cc templates/entry_show.tpl
Simple merge