From: Roland Haeder <roland@mxchange.org>
Date: Thu, 26 Feb 2015 00:01:11 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into social-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7ec725e2edb405c2a1f8421097ee1990f55771d2;p=quix0rs-gnu-social.git

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>
---

7ec725e2edb405c2a1f8421097ee1990f55771d2
diff --cc classes/File.php
index 1fcc83dd88,f1f1493dce..9e8c531901
--- a/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 292e6372a6,8c64c58a80..d52b29feae
--- a/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 lib/apiaction.php
index d85029f433,f1304a1d1e..f1304a1d1e
mode 100644,100755..100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
diff --cc plugins/GNUsocialVideo/classes/Video.php
index 9746948e16,09c1f6b844..9ba395d8ca
--- a/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);
      }