Merge branch 'feature/ISTWCMS-4945-ebremner-fix-links' into '1.0.x'

ISTWCMS-4945: fixing links in node data

See merge request !124

src/Service/UWService.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\uw_cfg_common\Service;
 
+use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -492,7 +493,15 @@ class UWService implements UWServiceInterface {
 
     // If there is data in the link, get the variables.
     if ($link_data) {
-      $return_link_data['uri'] = $link_data[0]['uri'];
+
+      // Get correct uri, if external just use uri from node
+      // value, if not, then generate url from uri.
+      if (UrlHelper::isExternal($link_data[0]['uri'])) {
+        $return_link_data['uri'] = $link_data[0]['uri'];
+      }
+      else {
+        $return_link_data['uri'] = URL::fromUri($link_data[0]['uri'])->toString();
+      }
       $return_link_data['title'] = $link_data[0]['title'];
     }