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

Conflicts:
	actions/apifriendshipsdestroy.php
	actions/apifriendshipsexists.php
	actions/apifriendshipsshow.php
	actions/apitimelineretweetedtome.php
	plugins/APC/APCPlugin.php
	plugins/Adsense/AdsensePlugin.php
	plugins/Aim/AimPlugin.php
	plugins/Aim/lib/aimmanager.php
	plugins/Directory/actions/groupdirectory.php
	plugins/Directory/actions/userdirectory.php
	plugins/Irc/IrcPlugin.php
	plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
	plugins/Irc/lib/ircmanager.php
	plugins/Spotify/SpotifyPlugin.php
	plugins/TinyMCE/TinyMCEPlugin.php
	plugins/VideoThumbnails/VideoThumbnailsPlugin.php
	plugins/WebFinger/WebFingerPlugin.php
	plugins/XCache/XCachePlugin.php
	plugins/YammerImport/actions/yammeradminpanel.php
	plugins/YammerImport/actions/yammerauth.php
	plugins/YammerImport/lib/yammerimporter.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc actions/apifriendshipsexists.php
Simple merge

diff --cc actions/apifriendshipsshow.php
Simple merge

diff --cc actions/apitimelineretweetedtome.php
Simple merge

diff --cc actions/apitimelineuser.php
Simple merge

diff --cc actions/doc.php
Simple merge

diff --cc classes/Avatar.php
Simple merge

diff --cc classes/Confirm_address.php
Simple merge

diff --cc classes/File.php
index 1fcc83dd8845f22943d406627ddda6d4be7d01fb,f1f1493dce55be6fd54d045ed825aaf501ce6171..9e8c531901d05fd3f8d561b44cc7db83ff8faf04
--- 1/classes/File.php
--- 2/classes/File.php
+++ b/classes/File.php
@@@ -405,12 -431,10 +431,13 @@@ class File extends Managed_DataObjec
              $crop = true;
          }
  
 +        // Debug log (convert crop to int to have TRUE being displayed as 1 and FALSE as 0)
 +        common_debug('[' . __METHOD__ . ':' . __LINE__ . ']: width=' . $width . ',height=' . $height . ',crop=' . intval($crop));
 +
          // Get proper aspect ratio width and height before lookup
          // We have to do it through an ImageFile object because of orientation etc.
-         // Only other solution would've been to rotate + rewrite uploaded files.
+         // Only other solution would've been to rotate + rewrite uploaded files
+         // which we don't want to do because we like original, untouched data!
          list($width, $height, $x, $y, $w, $h) =
                                  $image->scaleToFit($width, $height, $crop);
  

diff --cc classes/File_redirection.php
index 292e6372a65374687385e2180254c57849ff4077,8c64c58a80c79c4ae18b4df999c050b6bbf5cf5b..d52b29feaeeb12360d95be35127fc041069abad9
--- 1/classes/File_redirection.php
--- 2/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@@ -332,8 -346,9 +346,9 @@@ class File_redirection extends Managed_
          return $out_url;
      }
  
 -    function saveNew($data, $file_id, $url) {
 +    function saveNew(array $data, $file_id, $url) {
          $file_redir = new File_redirection;
+         $file_redir->urlhash = File::hashurl($short_url);
          $file_redir->url = $url;
          $file_redir->file_id = $file_id;
          $file_redir->redirections = intval($data['redirects']);

diff --cc classes/File_thumbnail.php
Simple merge

diff --cc classes/Memcached_DataObject.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc classes/User_group.php
Simple merge

diff --cc lib/activityimporter.php
Simple merge

diff --cc lib/apiaction.php
index d85029f4336ade4e9418afad4e7df32fcdf0eac2,f1304a1d1e4f40d7f28db1c480de4706628504df..f1304a1d1e4f40d7f28db1c480de4706628504df
mode 100644,100755..100644
--- 1/lib/apiaction.php
--- 2/lib/apiaction.php
+++ b/lib/apiaction.php

diff --cc lib/default.php
Simple merge

diff --cc lib/imagefile.php
Simple merge

diff --cc lib/installer.php
Simple merge

diff --cc lib/menu.php
Simple merge

diff --cc lib/noticelistitem.php
Simple merge

diff --cc lib/schemaupdater.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/AuthCrypt/AuthCryptPlugin.php
Simple merge

diff --cc plugins/Blog/classes/Blog_entry.php
Simple merge

diff --cc plugins/Bookmark/classes/Bookmark.php
Simple merge

diff --cc plugins/DirectMessage/classes/Message.php
Simple merge

diff --cc plugins/Directory/actions/groupdirectory.php
Simple merge

diff --cc plugins/Directory/actions/userdirectory.php
Simple merge

diff --cc plugins/Event/classes/Happening.php
Simple merge

diff --cc plugins/Event/classes/RSVP.php
Simple merge

diff --cc plugins/GNUsocialPhoto/classes/Photo.php
Simple merge

diff --cc plugins/GNUsocialVideo/classes/Video.php
index 9746948e16f93aefc7bc2fc2ef7f2024d188df0e,09c1f6b8443a0ee17ef11d8d8489228aebfc4156..9ba395d8cad839157f6f6a3ee75a0528280cda1b
--- 1/plugins/GNUsocialVideo/classes/Video.php
--- 2/plugins/GNUsocialVideo/classes/Video.php
+++ b/plugins/GNUsocialVideo/classes/Video.php
@@@ -39,11 -39,11 +39,11 @@@ class Video extends Managed_DataObjec
  
      public $__table = 'video'; // table name
      public $id;                // char (36) // UUID
-     public $uri;               // varchar (255)  // This is the corresponding notice's uri.
-     public $url;               // varchar (255)
+     public $uri;               // varchar (191)   This is the corresponding notice's uri.   not 255 because utf8mb4 takes more space
+     public $url;               // varchar (191)   not 255 because utf8mb4 takes more space
      public $profile_id;        // int
  
 -    public static function getByNotice($notice)
 +    public static function getByNotice(Notice $notice)
      {
          return self::getKV('uri', $notice->uri);
      }

diff --cc plugins/NoticeTitle/classes/Notice_title.php
Simple merge

diff --cc plugins/OStatus/classes/FeedSub.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge

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

diff --cc plugins/Oembed/classes/File_oembed.php
Simple merge

diff --cc plugins/OpenID/OpenIDPlugin.php
Simple merge

diff --cc plugins/Poll/classes/Poll.php
Simple merge

diff --cc plugins/Poll/classes/Poll_response.php
Simple merge

diff --cc plugins/QnA/classes/QnA_Answer.php
Simple merge

diff --cc plugins/QnA/classes/QnA_Question.php
Simple merge

diff --cc plugins/RSSCloud/RSSCloudPlugin.php
Simple merge

diff --cc plugins/VideoThumbnails/VideoThumbnailsPlugin.php
Simple merge

diff --cc plugins/WebFinger/WebFingerPlugin.php
Simple merge

diff --cc scripts/upgrade.php
Simple merge