keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

Browse source
This commit is contained in:
gerhard6380 2016-08-10 23:54:54 +02:00
commit b8af78d877
2 changed files with 819 additions and 798 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1615
util/messages.po
View file

File diff suppressed because it is too large Load diff

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

@ -223,7 +223,7 @@ function frio_remote_nav($a,&$nav) {
} elseif(!local_user() && remote_user()) { } elseif(!local_user() && remote_user()) {
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user())); $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
$nav['remote'] = t("Remote"); $nav['remote'] = t("Guest");
} elseif(get_my_url ()) { } elseif(get_my_url ()) {
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact` $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`