diff options
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 2 | ||||
-rw-r--r-- | phpBB/includes/functions_convert.php | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 71c2c764ed..0743a53ee9 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -593,7 +593,7 @@ class acp_permissions { global $user, $auth; - $psubmit = request_var('psubmit', array(0)); + $psubmit = request_var('psubmit', array(0 => array(0 => 0))); // User or group to be set? $ug_type = (sizeof($user_id)) ? 'user' : 'group'; diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 5da10236c2..e2b50306e8 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -2405,4 +2405,11 @@ function relative_base($path, $is_relative = true, $line = false, $file = false) return $convert->options['forum_path'] . '/' . $path; } +function get_smiley_display() +{ + static $smiley_count = 0; + $smiley_count++; + return ($smiley_count < 50) ? 1 : 0; +} + ?>
\ No newline at end of file |