ashalan

diff --git a/domain_path_rewrite.module b/domain_path_rewrite.module
index ac798af..c1ef06d 100644
--- a/domain_path_rewrite.module
+++ b/domain_path_rewrite.module
@@ -18,7 +18,16 @@ function domain_path_rewrite_init() {
  */
 function domain_path_rewrite_url_inbound_alter(&$path, $original_path, $path_language) {
   global $_domain;
-  $domain_key = empty($_domain['machine_name']) ? domain_load($_domain['domain_id'])['machine_name'] : $_domain['machine_name'];
+  

ashalan

diff --git a/domain_path_rewrite.module b/domain_path_rewrite.module
index 6b8d684..4c6603e 100644
--- a/domain_path_rewrite.module
+++ b/domain_path_rewrite.module
@@ -68,7 +68,9 @@ function _domain_path_rewrite_domain_path($source) {
       $cache[$row->source] = array(
         'domain_id' => $row->domain_id,
         'path' => $path,
-        'url' => $domains[$row->domain_id]->scheme . '://' . $domains[$row->domain_id]->subdomain . ($path ? '/' . $path : ''),
+        'domain' => $domains[$row->domain_id]->scheme . '://' . $domains[$row->domain_id]->subdomain,

ashalan

diff --git a/domain_path_rewrite.module b/domain_path_rewrite.module
index 6b8d684..d658e5c 100644
--- a/domain_path_rewrite.module
+++ b/domain_path_rewrite.module
@@ -38,8 +38,13 @@ function domain_path_rewrite_url_inbound_alter(&$path, $original_path, $path_lan
  */
 function domain_path_rewrite_url_outbound_alter(&$path, &$options, $original_path) {
   if ($domain_path = _domain_path_rewrite_domain_path($original_path)) {
-    $path = $domain_path['url'];
     $options['external'] = strpos($path, '//') !== FALSE;

ashalan

diff --git a/linkit.module b/linkit.module
index 805ba9a..fe4e924 100644
--- a/linkit.module
+++ b/linkit.module
@@ -1138,7 +1138,7 @@ function linkit_get_profile_type($type) {
 function linkit_get_insert_plugin_processed_path(LinkitProfile $profile, $uri, $options = array()) {
     switch ($profile->data['insert_plugin']['url_method']) {
       case LINKIT_URL_METHOD_RAW:
-        $path = $uri;
+       $path = url($uri, $options);