harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/red

Browse Source
This commit is contained in:
Mario Vavti 2015-03-08 12:07:43 +01:00
commit 5bf49dabc6
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -8,7 +8,7 @@
*.lock *.lock
*.kate-swp *.kate-swp
#Ignore emacs tempfiles #Ignore emacs tempfiles
.#* \#*
# patch attempts # patch attempts
*.orig *.orig
*.rej *.rej

11
include/identity.php
View File

@ -724,12 +724,13 @@ function profile_load(&$a, $nickname, $profile = '') {
$p[0]['extra_fields'] = $extra_fields; $p[0]['extra_fields'] = $extra_fields;
$z = q("select xchan_photo_date from xchan where xchan_hash = '%s' limit 1", $z = q("select xchan_photo_date, xchan_addr from xchan where xchan_hash = '%s' limit 1",
dbesc($p[0]['channel_hash']) dbesc($p[0]['channel_hash'])
); );
if($z) if($z) {
$p[0]['picdate'] = $z[0]['xchan_photo_date']; $p[0]['picdate'] = $z[0]['xchan_photo_date'];
$p[0]['reddress'] = str_replace('@','＠',$z[0]['xchan_addr']);
}
// fetch user tags if this isn't the default profile // fetch user tags if this isn't the default profile
@ -817,6 +818,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
$location = false; $location = false;
$address = false; $address = false;
$pdesc = true; $pdesc = true;
$reddress = true;
if((! is_array($profile)) && (! count($profile))) if((! is_array($profile)) && (! count($profile)))
return $o; return $o;
@ -906,7 +908,7 @@ logger('online: ' . $profile['online']);
} }
if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) { if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) {
$location = $pdesc = $gender = $marital = $homepage = $online = False; $location = $reddress = $pdesc = $gender = $marital = $homepage = $online = False;
} }
$firstname = ((strpos($profile['channel_name'],' ')) $firstname = ((strpos($profile['channel_name'],' '))
@ -957,6 +959,7 @@ logger('online: ' . $profile['online']);
'$homepage' => $homepage, '$homepage' => $homepage,
'$chanmenu' => $channel_menu, '$chanmenu' => $channel_menu,
'$diaspora' => $diaspora, '$diaspora' => $diaspora,
'$reddress' => $reddress,
'$rating' => $z, '$rating' => $z,
'$contact_block' => $contact_block, '$contact_block' => $contact_block,
)); ));

8
mod/dirsearch.php
View File

@ -12,6 +12,8 @@ function dirsearch_content(&$a) {
$ret = array('success' => false); $ret = array('success' => false);
// logger('request: ' . print_r($_REQUEST,true));
$dirmode = intval(get_config('system','directory_mode')); $dirmode = intval(get_config('system','directory_mode'));
@ -119,7 +121,7 @@ function dirsearch_content(&$a) {
$sql_extra .= dir_query_build($joiner,'xprof_keywords',$keywords); $sql_extra .= dir_query_build($joiner,'xprof_keywords',$keywords);
if($forums) if($forums)
$sql_extra .= dir_flag_build(' AND ','xchan_flags',XCHAN_FLAGS_PUBFORUM, $forums); $safesql .= dir_flag_build(' AND ','xchan_flags',XCHAN_FLAGS_PUBFORUM, $forums);
// we only support an age range currently. You must set both agege // we only support an age range currently. You must set both agege
@ -165,9 +167,9 @@ function dirsearch_content(&$a) {
} }
$safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 " : ''); $safesql .= (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 " : '');
if($safe < 0) if($safe < 0)
$safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 "; $safesql .= " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 ";
if($limit) if($limit)
$qlimit = " LIMIT $limit "; $qlimit = " LIMIT $limit ";

2
version.inc
View File

@ -1 +1 @@
2015-03-06.963 2015-03-07.964

2
view/tpl/profile_vcard.tpl
View File

@ -16,7 +16,7 @@
{{/if}} {{/if}}
<div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>