From: Mikael Nordfeldth Date: Mon, 21 Apr 2014 17:32:08 +0000 (+0200) Subject: use intval() instead of floor() for int return type X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7f3611c51c53acb46e17189194f0ed82beee7914;p=quix0rs-gnu-social.git use intval() instead of floor() for int return type --- diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index d3d5b31002..0a5f79e763 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -369,7 +369,7 @@ class AvatarsettingsAction extends SettingsAction $dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0; $dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$file_d; $dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$file_d; - $size = floor(min($dest_w, $dest_h, MAX_ORIGINAL)); + $size = intval(min($dest_w, $dest_h, MAX_ORIGINAL)); $user = common_current_user(); $profile = $user->getProfile(); diff --git a/classes/Avatar.php b/classes/Avatar.php index 02874b902b..55abc81b33 100644 --- a/classes/Avatar.php +++ b/classes/Avatar.php @@ -90,8 +90,8 @@ class Avatar extends Managed_DataObject */ public static function byProfile(Profile $target, $width=null, $height=null) { - $width = (int) floor($width); - $height = !is_null($height) ? (int) floor($height) : null; + $width = intval($width); + $height = !is_null($height) ? intval($height) : null; if (is_null($height)) { $height = $width; } @@ -236,7 +236,7 @@ class Avatar extends Managed_DataObject } static function newSize(Profile $target, $width) { - $width = (int) floor($width); + $width = intval($width); if ($width < 1 || $width > common_config('avatar', 'maxsize')) { // TRANS: An error message when avatar size is unreasonable throw new Exception(_m('Avatar size too large'));