diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-20 17:57:42 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-20 17:57:42 -0700 |
| commit | 542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20 (patch) | |
| tree | 59aa36f7dfcc89cf4b79340b909cf7dd77f1a234 | |
| parent | bc8c74eb422387a5537eb923c90a34c1196ce568 (diff) | |
| parent | 1d90c4ea999fd3a440f2c55a90793ac452876ca2 (diff) | |
| download | volse-hubzilla-542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20.tar.gz volse-hubzilla-542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20.tar.bz2 volse-hubzilla-542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20.zip | |
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
| -rw-r--r-- | Zotlabs/Module/Acl.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Zot/Finger.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 15609c3c8..76a001fdd 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -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 diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index 229fda8bd..e7603442f 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -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; } -}
\ No newline at end of file +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d61e60dc9..6cc3e2f10 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2037,3 +2037,7 @@ dl.bb-dl > dd > li { border-style: solid; border-width: 5px; } + +#wiki-preview img { + max-width: 100%; +}
\ No newline at end of file diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 7617808f4..d9a4f8be3 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -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) { |