Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
	classes/File.php

diff --cc actions/apimediaupload.php
Simple merge

diff --cc actions/attachment.php
Simple merge

diff --cc actions/confirmaddress.php
Simple merge

diff --cc actions/recoverpassword.php
Simple merge

diff --cc classes/File.php
index 9bb22e502b6203297980c2c93769b357954820fa,68da5c6f1ba6583d5f58a94b89f166969000967a..429ecc455cd295befc4c7656797327f041cbaa3e
--- 1/classes/File.php
--- 2/classes/File.php
+++ b/classes/File.php
@@@ -432,25 -422,14 +425,26 @@@ class File extends Managed_DataObjec
          // Doublecheck that parameters are sane and integers.
          if ($box['width'] < 1 || $box['width'] > common_config('thumbnail', 'maxsize')
                  || $box['height'] < 1 || $box['height'] > common_config('thumbnail', 'maxsize')
-                 || $box['w'] < 1 || $box['x'] >= $this->width
-                 || $box['h'] < 1 || $box['y'] >= $this->height) {
+                 || $box['w'] < 1 || $box['x'] >= $image->width
+                 || $box['h'] < 1 || $box['y'] >= $image->height) {
              // Fail on bad width parameter. If this occurs, it's due to algorithm in ImageFile->scaleToFit
-             common_debug("Boundary box parameters for resize of {$this->filepath} : ".var_export($box,true));
+             common_debug("Boundary box parameters for resize of {$image->filepath} : ".var_export($box,true));
 -            throw new ServerException('Bad thumbnail size parameters.');
 +            throw new ServerException('Bad thumbnail size parameters. maxsize=' .
 +                common_config('thumbnail', 'maxsize') .
 +                ',box[width]=' . $box['width'] .
 +                ',box[height]=' . $box['height'] .
 +                ',box[w]=' . $box['w'] .
 +                ',box[h]=' . $box['h'] .
 +                ',box[x]=' . $box['x'] .
 +                ',box[y]=' . $box['y'] .
 +                ',this->width=' . $this->width .
 +                ',this->heigh=' . $this->height .
 +                ',this->filepath=' . $this->filepath .
 +                ',this->filename=' . $this->filename
 +            );
          }
  
+         common_debug(sprintf('Generating a thumbnail of File id==%u of size %ux%u', $this->id, $width, $height));
          // Perform resize and store into file
          $image->resizeTo($outpath, $box);
  

diff --cc classes/Notice.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/framework.php
Simple merge

diff --cc lib/imagefile.php
Simple merge

diff --cc plugins/Mapstraction/actions/map.php
Simple merge

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge

diff --cc plugins/OStatus/lib/magicenvelope.php
Simple merge

diff --cc scripts/clear_jabber.php
Simple merge

diff --cc scripts/registeruser.php
Simple merge