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

fix some issues that couldn't be tested yesterday - as was working offline

Browse Source
This commit is contained in:
friendica 2012-10-07 16:39:29 -07:00
parent 40ac736fc7
commit c612253627
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -663,7 +663,7 @@ if(! class_exists('App')) {
$this->widgets[] = array('title' => $title, 'html' => $html, 'location' => $location); $this->widgets[] = array('title' => $title, 'html' => $html, 'location' => $location);
} }
function get_widgets($location) { function get_widgets($location = '') {
if($location && count($this->widgets)) { if($location && count($this->widgets)) {
$ret = array(); $ret = array();
foreach($widgets as $w) foreach($widgets as $w)

8
include/items.php
View File

@ -978,8 +978,8 @@ function item_store($arr,$force_parent = false) {
$arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : '');
$arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : ''); $arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : '');
$arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : ''); $arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : '');
$arr['item_restrict'] = ((x($arr['item_restrict']))? intval($arr['item_restrict'])) : 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['item_flags'] = ((x($arr,'item_flags')) ? intval($arr['item_flags']) : 0 );
$arr['thr_parent'] = $arr['parent_uri']; $arr['thr_parent'] = $arr['parent_uri'];
@ -1027,7 +1027,7 @@ function item_store($arr,$force_parent = false) {
$deny_cid = $r[0]['deny_cid']; $deny_cid = $r[0]['deny_cid'];
$deny_gid = $r[0]['deny_gid']; $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; $arr['item_flags'] = $arr['item_flags'] | ITEM_WALL;
// if the parent is private, force privacy for the entire conversation // 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 // 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. // 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; $arr['private'] = 0;
} }
else { else {

2
version.inc
View File

@ -1 +1 @@
2012-10-06.99 2012-10-07.100