diff options
| author | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-10-01 19:26:21 +0200 |
|---|---|---|
| committer | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-10-01 19:26:21 +0200 |
| commit | 9cce852ac71fcd12970e985f1f61697333849172 (patch) | |
| tree | c40ce5543c412035ca03188f7bd9e565efb62117 /mod | |
| parent | a548f644d05f330a2b70c87df821bce05007c979 (diff) | |
| parent | f19d718631675d38efca1741f46bf0916af72a65 (diff) | |
| download | volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.gz volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.bz2 volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.zip | |
Merge from upstream
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/profile_photo.php | 4 | ||||
| -rw-r--r-- | mod/siteinfo.php | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mod/profile_photo.php b/mod/profile_photo.php index c587b9606..aad9c9d16 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -364,7 +364,9 @@ function profile_photo_content(&$a) { // FIXME - yuk '$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . $a->get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. $a->get_baseurl() . '/photos/' . $a->channel['channel_address'] . '">' . t('select a photo from your photo albums') . '</a>') )); - + + call_hooks('profile_photo_content_end', $o); + return $o; } else { diff --git a/mod/siteinfo.php b/mod/siteinfo.php index bdae14edb..eab52e41e 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -4,7 +4,8 @@ function siteinfo_init(&$a) { if ($a->argv[1]=="json"){ $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'); - + $directory_mode = Array('DIRECTORY_MODE_NORMAL', 'DIRECTORY_MODE_SECONDARY','DIRECTORY_MODE_PRIMARY', 'DIRECTORY_MODE_STANDALONE'); + $sql_extra = ''; $r = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) and account_default_channel = channel_id"); @@ -54,7 +55,7 @@ function siteinfo_init(&$a) { $r = q("select count(channel_id) as channels_total from channel left join account on account_id = channel_account_id where account_flags = 0 "); if($r) - $channels_total = $r[0]['channels_total']; + $channels_total = intval($r[0]['channels_total']); $r = q("select channel_id from channel left join account on account_id = channel_account_id where account_flags = 0 and account_lastlog > UTC_TIMESTAMP - INTERVAL 6 MONTH"); @@ -92,7 +93,7 @@ function siteinfo_init(&$a) { intval(ITEM_WALL) ); if (is_array($posts)) - $local_posts = $posts[0]["local_posts"]; + $local_posts = intval($posts[0]["local_posts"]); $data = Array( 'version' => RED_VERSION, @@ -100,6 +101,7 @@ function siteinfo_init(&$a) { 'url' => z_root(), 'plugins' => $visible_plugins, 'register_policy' => $register_policy[$a->config['system']['register_policy']], + 'directory_mode' => $directory_mode[$a->config['system']['directory_mode']], 'diaspora_emulation' => get_config('system','diaspora_enabled'), 'rss_connections' => get_config('system','feed_contacts'), 'default_service_restrictions' => $service_class, |