Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (21 commits)
  more logging on pubsub callbacks
  provide ability to autofriend ostatus accounts
  ostatus hub subscription issues
  better events-reminder theming
  png support for embedded private photos
  rev update
  png support: update database.sql, fix some typos, fix tinymce image browser
  Add support for PNG images with alpha
  fix a random profile error message
  events: fix select events query select events that starts before display start date and/or ends after display end date.
  more logging on subscribe_to_hub
  admin page untranslated strings, remove empty list element for update
  A few corrections in German translations.
  rev update
  set minchars to 2 for PM lookups too
  set minchars to 2 for contacts search
  contacts search autocomplete
  add email probe logging, limit typo check to main addon files and skip additional support files
  rev update
  named anchors on display page
  ...

1 files changed, 4 insertions, 1 deletions

diff --git a/include/network.php b/include/network.php
index eeb2460d1..446413cd8 100644
--- a/include/network.php
+++ b/include/network.php
@@ -807,8 +807,11 @@ function scale_external_images($s,$include_link = true) {
 			if(stristr($mtch[1],$hostname))
 				continue;
 			$i = fetch_url($mtch[1]);
+			// guess mimetype from headers or filename
+			$type = guess_image_type($mtch[1],true);
+			
 			if($i) {
-				$ph = new Photo($i);
+				$ph = new Photo($i, $type);
 				if($ph->is_valid()) {
 					$orig_width = $ph->getWidth();
 					$orig_height = $ph->getHeight();