diff --git a/Dataface/ResultList.php b/Dataface/ResultList.php index f47ded43..121e79af 100644 --- a/Dataface/ResultList.php +++ b/Dataface/ResultList.php @@ -391,7 +391,7 @@ function toHtml(){ if ( @$recperms['link'] ){ if ( @$app->prefs['result_list_use_geturl'] ){ - $link = $record->getURL('-action=view'); + $link = $record->getURL($query); } else { $link = Dataface_LinkTool::buildLink($query).'&-recordid='.urlencode($record->getId()); diff --git a/Dataface/templates/xataface/RelatedList/result_controller.html b/Dataface/templates/xataface/RelatedList/result_controller.html index 9c3a7bdf..50648a9a 100644 --- a/Dataface/templates/xataface/RelatedList/result_controller.html +++ b/Dataface/templates/xataface/RelatedList/result_controller.html @@ -8,7 +8,7 @@ Now Showing {$now_showing_start|escape} to {$now_showing_finish|escape} {/translate} -
+
{$limit_field}
diff --git a/public-api.php b/public-api.php index 56caee92..2f2d34ee 100644 --- a/public-api.php +++ b/public-api.php @@ -718,21 +718,7 @@ function df_is_logged_in(){ } function df_absolute_url($url){ - if ( !$url ) return $_SERVER['HOST_URI']; - else if ( $url{0} == '/' ){ - return $_SERVER['HOST_URI'].$url; - } else if ( preg_match('/http(s)?:\/\//', $url) ){ - return $url; - } else { - $host_uri = $_SERVER['HOST_URI']; - $site_url = DATAFACE_SITE_URL; - if ( $site_url ) { - if ($site_url{0} == '/' ) $host_uri = $host_uri.$site_url; - else $host_uri = $host_uri.'/'.$site_url; - } - - return $host_uri.'/'.$url; - } + return $url; }