aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-06-24 12:33:53 +0200
committerMario Vavti <mario@mariovavti.com>2015-06-24 12:33:53 +0200
commitf707f4d49a8ae29d511dce402d3b5629d466fff9 (patch)
treef02bfbf4a9ff8f9ea0266fc78d645d5c61ebdc9f
parent201ba411ba9828bd29dcebf161471e6e8dfa3f82 (diff)
parent7975bc828fc9ae1cf9b92cc2147297a46524d59f (diff)
downloadvolse-hubzilla-f707f4d49a8ae29d511dce402d3b5629d466fff9.tar.gz
volse-hubzilla-f707f4d49a8ae29d511dce402d3b5629d466fff9.tar.bz2
volse-hubzilla-f707f4d49a8ae29d511dce402d3b5629d466fff9.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
-rw-r--r--mod/item.php2
-rw-r--r--version.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/item.php b/mod/item.php
index 8a73974c6..bc2710b42 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1097,7 +1097,7 @@ function fix_attached_file_permissions($channel,$observer_hash,$body,
}
function item_check_service_class($channel_id,$iswebpage) {
- $ret = array('success' => false, $message => '');
+ $ret = array('success' => false, 'message' => '');
if ($iswebpage) {
// note: we aren't counting comanche templates and blocks, only webpages
diff --git a/version.inc b/version.inc
index cbaf6aa9c..df3ed0059 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-06-22.1071
+2015-06-23.1072