Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-24 16:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1143 from annando/master

Browse source 
Bugfix: "nurl" wasn't set/"remoteconnect" was missing in several templates
This commit is contained in:
tobiasd 2014-09-12 06:58:41 +02:00
commit 9df7aeee55
6 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/crepair.php
View file

@ -60,12 +60,14 @@ function crepair_post(&$a) {
$attag = ((x($_POST,'attag')) ? $_POST['attag'] : ''); $attag = ((x($_POST,'attag')) ? $_POST['attag'] : '');
$photo = ((x($_POST,'photo')) ? $_POST['photo'] : ''); $photo = ((x($_POST,'photo')) ? $_POST['photo'] : '');
$remote_self = ((x($_POST,'remote_self')) ? $_POST['remote_self'] : false); $remote_self = ((x($_POST,'remote_self')) ? $_POST['remote_self'] : false);
$nurl = normalise_link($url);
$r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' , `remote_self` = %d $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `nurl` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' , `remote_self` = %d
WHERE `id` = %d AND `uid` = %d", WHERE `id` = %d AND `uid` = %d",
dbesc($name), dbesc($name),
dbesc($nick), dbesc($nick),
dbesc($url), dbesc($url),
dbesc($nurl),
dbesc($request), dbesc($request),
dbesc($confirm), dbesc($confirm),
dbesc($notify), dbesc($notify),

8
view/templates/profile_vcard.tpl
View file

@ -40,8 +40,12 @@
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>
{{if $connect}} {{if $connect}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li> {{if $remoteconnect}}
{{/if}} <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{/if}}
{{if $wallmessage}} {{if $wallmessage}}
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li> <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
{{/if}} {{/if}}

8
view/theme/duepuntozero/templates/profile_vcard.tpl
View file

@ -38,8 +38,12 @@
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>
{{if $connect}} {{if $connect}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li> {{if $remoteconnect}}
{{/if}} <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{/if}}
{{if $wallmessage}} {{if $wallmessage}}
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li> <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
{{/if}} {{/if}}

8
view/theme/quattro/templates/profile_vcard.tpl
View file

@ -61,8 +61,12 @@
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>
{{if $connect}} {{if $connect}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li> {{if $remoteconnect}}
{{/if}} <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{/if}}
{{if $wallmessage}} {{if $wallmessage}}
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li> <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
{{/if}} {{/if}}

2
view/theme/vier/theme.php
View file

@ -30,7 +30,7 @@ else if ($style == "plus")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/plus.css" type="text/css" media="screen"/>'."\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/plus.css" type="text/css" media="screen"/>'."\n";
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script> <script type="text/javascript">
function collapseHeight(elems) { function collapseHeight(elems) {
var elemName = '.wall-item-body:not(.divmore)'; var elemName = '.wall-item-body:not(.divmore)';