From: Roland Haeder <roland@mxchange.org>
Date: Fri, 20 Feb 2015 12:58:14 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f1351844e80d2aef579309fb74b5f6a9c9ece874;p=quix0rs-gnu-social.git

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

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

f1351844e80d2aef579309fb74b5f6a9c9ece874
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);
      }