diff options
| -rwxr-xr-x | boot.php | 4 | ||||
| -rw-r--r-- | doc/permissions.bb | 2 | ||||
| -rw-r--r-- | include/security.php | 13 | ||||
| -rw-r--r-- | mod/settings.php | 2 |
4 files changed, 17 insertions, 4 deletions
@@ -982,9 +982,9 @@ class App { if ($user_scalable === false) $user_scalable = 1; - $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000); + $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 80000); if($interval < 10000) - $interval = 40000; + $interval = 80000; if(! x($this->page,'title')) $this->page['title'] = $this->config['system']['sitename']; diff --git a/doc/permissions.bb b/doc/permissions.bb index 8a071a3f5..c893ed84f 100644 --- a/doc/permissions.bb +++ b/doc/permissions.bb @@ -66,7 +66,7 @@ This permission determines who can write to your wall when clicking through to y [i]Can comment on my posts.[/i]
-This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public pages" permission
+This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public stream and posts" permission
[i]Can send me private mail messages.[/i]
diff --git a/include/security.php b/include/security.php index 0f2edc708..e83cc7061 100644 --- a/include/security.php +++ b/include/security.php @@ -82,6 +82,19 @@ function change_channel($change_channel) { intval(PAGE_REMOVED) ); + // It's not there. Is this an administrator, and is this the sys channel? + if (is_developer()) { + if (! $r) { + if (is_site_admin()) { + $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel_id = %d and ( channel_pageflags & %d) and not (channel_pageflags & %d ) limit 1", + intval($change_channel), + intval(PAGE_SYSTEM), + intval(PAGE_REMOVED) + ); + } + } + } + if($r) { $hash = $r[0]['channel_hash']; $_SESSION['uid'] = intval($r[0]['channel_id']); diff --git a/mod/settings.php b/mod/settings.php index 81596a27e..876216871 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -736,7 +736,7 @@ function settings_content(&$a) { $user_scalable = (($user_scalable===false)? '1': $user_scalable); // default if not set: 1 $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); - $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds + $browser_update = (($browser_update == 0) ? 80 : $browser_update / 1000); // default if not set: 40 seconds $itemspage = intval(get_pconfig(local_user(), 'system','itemspage')); $itemspage = (($itemspage > 0 && $itemspage < 101) ? $itemspage : 20); // default if not set: 20 items |