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

a bit of e_all cleanup

Browse Source
This commit is contained in:
friendica
2012-12-08 14:18:02 -08:00
parent ddedbda966
commit c70777e19c
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@@ -9,6 +9,8 @@ require_once('include/Photo.php');
function collect_recipients($item,&$private) {
require_once('include/group.php');
if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
$allow_people = expand_acl($item['allow_cid']);
$allow_groups = expand_groups(expand_acl($item['allow_gid']));

2
include/nav.php
View File

@@ -52,7 +52,7 @@ EOT;
$observer = $a->get_observer();
$myident = (($channel) ? $channel['xchan_address'] : '');
$myident = (($channel) ? $channel['xchan_addr'] : '');
$sitelocation = (($myident) ? $myident : $a->get_hostname());

7
include/plugin.php
View File

@@ -484,8 +484,11 @@ function theme_include($file) {
'view/$file'
);
$parent = get_app()->theme_info['extends'];
if(! $parent)
$theme_info = get_app()->theme_info;
if(array_key_exists('extends',$theme_info))
$parent = $theme_info['extends'];
else
$parent = 'NOPATH';
foreach($paths as $p) {

2
include/security.php
View File

@@ -121,7 +121,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
}
if($return || $_SESSION['workflow']) {
if($return || x($_SESSION,'workflow')) {
unset($_SESSION['workflow']);
return;
}