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

Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge

Browse Source
This commit is contained in:
redmatrix 2016-07-20 17:57:42 -07:00
commit 542fcaff9a
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Acl.php
View File

@ -222,7 +222,7 @@ class Acl extends \Zotlabs\Web\Controller {
}
elseif($type == 'm') {
$r = q("SELECT xchan_hash as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
$r = q("SELECT xchan_hash as hash, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d and ( (abook_their_perms = null) or (abook_their_perms & %d )>0)
and xchan_deleted = 0

4
Zotlabs/Zot/Finger.php
View File

@ -28,7 +28,7 @@ class Finger {
if (strpos($webbie,'@') === false) {
$address = $webbie;
$host = App::get_hostname();
$host = \App::get_hostname();
} else {
$address = substr($webbie,0,strpos($webbie,'@'));
$host = substr($webbie,strpos($webbie,'@')+1);
@ -127,4 +127,4 @@ class Finger {
return $x;
}
}
}

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

@ -2037,3 +2037,7 @@ dl.bb-dl > dd > li {
border-style: solid;
border-width: 5px;
}
#wiki-preview img {
max-width: 100%;
}

3
view/tpl/wiki.tpl
View File

@ -311,6 +311,9 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
ev.preventDefault();
return false;
}
if(!confirm('Are you sure you want to delete the page: ' + window.wiki_page_name)) {
return;
}
$.post("wiki/{{$channel}}/delete/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id},
function (data) {
if (data.success) {