aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-10-07 16:39:29 -0700
committerfriendica <info@friendica.com>2012-10-07 16:39:29 -0700
commitc612253627019c146b8a49d6f927b475cac8be2f (patch)
tree506d0d074bb1baa636a62df12c33706c3200037f
parent40ac736fc795d6a05a2df1874ff85ec1b25e363a (diff)
downloadvolse-hubzilla-c612253627019c146b8a49d6f927b475cac8be2f.tar.gz
volse-hubzilla-c612253627019c146b8a49d6f927b475cac8be2f.tar.bz2
volse-hubzilla-c612253627019c146b8a49d6f927b475cac8be2f.zip
fix some issues that couldn't be tested yesterday - as was working offline
-rw-r--r--boot.php2
-rwxr-xr-xinclude/items.php8
-rw-r--r--version.inc2
3 files changed, 6 insertions, 6 deletions
diff --git a/boot.php b/boot.php
index 7e4cbbada..7d4310413 100644
--- a/boot.php
+++ b/boot.php
@@ -663,7 +663,7 @@ if(! class_exists('App')) {
$this->widgets[] = array('title' => $title, 'html' => $html, 'location' => $location);
}
- function get_widgets($location) {
+ function get_widgets($location = '') {
if($location && count($this->widgets)) {
$ret = array();
foreach($widgets as $w)
diff --git a/include/items.php b/include/items.php
index 9537f07e4..cd6ab943d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -978,8 +978,8 @@ function item_store($arr,$force_parent = false) {
$arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : '');
$arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : '');
$arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : '');
- $arr['item_restrict'] = ((x($arr['item_restrict']))? intval($arr['item_restrict'])) : 0 );
- $arr['item_flags'] = ((x($arr['item_flags'])) ? intval($arr['item_flags'])) : 0 );
+ $arr['item_restrict'] = ((x($arr,'item_restrict')) ? intval($arr['item_restrict']) : 0 );
+ $arr['item_flags'] = ((x($arr,'item_flags')) ? intval($arr['item_flags']) : 0 );
$arr['thr_parent'] = $arr['parent_uri'];
@@ -1027,7 +1027,7 @@ function item_store($arr,$force_parent = false) {
$deny_cid = $r[0]['deny_cid'];
$deny_gid = $r[0]['deny_gid'];
- if($r[0]['item_flags']) & ITEM_WALL)
+ if($r[0]['item_flags'] & ITEM_WALL)
$arr['item_flags'] = $arr['item_flags'] | ITEM_WALL;
// if the parent is private, force privacy for the entire conversation
@@ -1041,7 +1041,7 @@ function item_store($arr,$force_parent = false) {
// The original author commented, but as this is a comment, the permissions
// weren't fixed up so it will still show the comment as private unless we fix it here.
- if((intval($r[0]['item_flags'] & ITEM_UPLINK) && (! $r[0]['private']))
+ if((intval($r[0]['item_flags']) & ITEM_UPLINK) && (! $r[0]['private']))
$arr['private'] = 0;
}
else {
diff --git a/version.inc b/version.inc
index a9476eef4..504c93750 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-10-06.99
+2012-10-07.100