aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-10 15:43:59 -0800
committerredmatrix <git@macgirvin.com>2016-03-10 15:43:59 -0800
commit32c23ef562fc963c2972c51895b4cfa71743e495 (patch)
tree64ee3cd7ddca017ac3b33b73668d515d85e2c22c
parent107f80892a19f0ccd0cd30a0e3fc5ce3a41829b7 (diff)
downloadvolse-hubzilla-32c23ef562fc963c2972c51895b4cfa71743e495.tar.gz
volse-hubzilla-32c23ef562fc963c2972c51895b4cfa71743e495.tar.bz2
volse-hubzilla-32c23ef562fc963c2972c51895b4cfa71743e495.zip
some minor cleanups
-rw-r--r--include/attach.php2
-rw-r--r--include/security.php2
-rw-r--r--install/INSTALL.txt3
-rw-r--r--version.inc2
4 files changed, 5 insertions, 4 deletions
diff --git a/include/attach.php b/include/attach.php
index 2777b5813..343922a52 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -846,7 +846,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
// Caution: This re-uses $sql_options set further above
- $r = q("select id, aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d and hash = '%s' $sql_options limit 1",
+ $r = q("select * from attach where uid = %d and hash = '%s' $sql_options limit 1",
intval($channel_id),
dbesc($hash)
);
diff --git a/include/security.php b/include/security.php
index 215cc92cb..f3cf2d1b6 100644
--- a/include/security.php
+++ b/include/security.php
@@ -415,7 +415,7 @@ function init_groups_visitor($contact_id) {
$r = q("SELECT hash FROM `groups` left join group_member on groups.id = group_member.gid WHERE xchan = '%s' ",
dbesc($contact_id)
);
- if(count($r)) {
+ if($r) {
foreach($r as $rr)
$groups[] = $rr['hash'];
}
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 37faddc55..1d3811501 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -67,7 +67,8 @@ If you use LetsEncrypt to provide certificates and create a file under
please remove or rename the .well-known directory as soon as the certificate is
generated. Hubzilla will provide its own handler for ".well-known" services when
it is installed, and an existing directory in this location may prevent some of
-these services from working correctly.
+these services from working correctly. This should not be a problem with Apache,
+but may be an issue with nginx or other web server platforms.
1. Requirements
diff --git a/version.inc b/version.inc
index 3d66d0abe..2114d89be 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-03-08.1330H
+2016-03-10.1331H