diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rw-r--r-- | include/plugin.php | 7 | ||||
| -rw-r--r-- | include/security.php | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 7e38469e8..fe29d1635 100755 --- a/include/items.php +++ b/include/items.php @@ -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'])); diff --git a/include/nav.php b/include/nav.php index 7db053741..61ae16644 100644 --- a/include/nav.php +++ b/include/nav.php @@ -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()); diff --git a/include/plugin.php b/include/plugin.php index c5039692a..46a659ddc 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -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) { diff --git a/include/security.php b/include/security.php index eeec2b3d6..dfe646b8d 100644 --- a/include/security.php +++ b/include/security.php @@ -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; } |