Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix #75

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

bugfix #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a167dbe
fixed links not being generated properly when option result_list_use_…
jirikapoun Jul 14, 2016
c6c8f9e
removed undue escaping of double quotes
jirikapoun Jul 16, 2016
129f0c6
merged commits from original repository
jirikapoun Oct 9, 2017
a36056a
disabled absolute URIs
jirikapoun Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dataface/ResultList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion Dataface/templates/xataface/RelatedList/result_controller.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<b>Now Showing</b> {$now_showing_start|escape} to {$now_showing_finish|escape}
{/translate}
</div>
<div class=\"limit-field\">
<div class="limit-field">
{$limit_field}
</div>
<div class="prev-link">{$back_link}</div>
Expand Down
16 changes: 1 addition & 15 deletions public-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}


Expand Down