upstream fixes and a lot of taxonomy stuff

1 files changed, 7 insertions, 1 deletions

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index e44707f9b..fc0e0419e 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -127,7 +127,7 @@ function profile_photo_post(&$a) {
 		@unlink($src);
 		return;
 	}
-
+	$ph->orient($src);
 	@unlink($src);
 	return profile_photo_crop_ui_head($a, $ph);
 	
@@ -237,6 +237,12 @@ function profile_photo_content(&$a) {
 
 if(! function_exists('_crop_ui_head')) {
 function profile_photo_crop_ui_head(&$a, $ph){
+	$max_length = get_config('system','max_image_length');
+	if(! $max_length)
+		$max_length = MAX_IMAGE_LENGTH;
+	if($max_length > 0)
+		$ph->scaleImage($max_length);
+
 	$width = $ph->getWidth();
 	$height = $ph->getHeight();