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

allow zot-info to return results for address= with webbies or naked nicknames

Browse Source
This commit is contained in:
friendica 2013-11-29 00:57:47 -08:00
parent 2563edab43
commit df66c510c9
4 changed files with 4971 additions and 4938 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/zfinger.php
View File

@ -53,7 +53,8 @@ function zfinger_init(&$a) {
} }
elseif(strlen($zaddr)) { elseif(strlen($zaddr)) {
$r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
where channel_address = '%s' limit 1", where ( channel_address = '%s' or xchan_addr = '%s' ) limit 1",
dbesc($zaddr),
dbesc($zaddr) dbesc($zaddr)
); );
} }

9901
util/messages.po
View File

File diff suppressed because it is too large Load Diff

2
version.inc
View File

@ -1 +1 @@
2013-11-28.511 2013-11-29.512

3
view/theme/redbasic/css/style.css
View File

@ -1131,10 +1131,9 @@ footer {
margin-left: 50px; margin-left: 50px;
} }
#profile-jot-plugin-wrapper,
#profile-jot-submit-wrapper { #profile-jot-submit-wrapper {
margin-top: 10px; margin-top: 10px;
width:92%; width: 90%;
} }
#profile-upload-wrapper { #profile-upload-wrapper {