GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'utf8mb4' into nightly

Browse Source 
Conflicts because of urlhash fixes:
	classes/File.php
	classes/File_redirection.php
	classes/File_thumbnail.php
This commit is contained in:
Mikael Nordfeldth
2015-02-19 20:50:40 +01:00
parent 5471c65c9a 2f86cd8602
commit 0590f2975e
67 changed files with 278 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Blog/classes/Blog_entry.php
View File

@@ -51,11 +51,11 @@ class Blog_entry extends Managed_DataObject
public $id; // UUID
public $profile_id; // int
public $title; // varchar(255)
public $title; // varchar(191) not 255 because utf8mb4 takes more space
public $summary; // text
public $content; // text
public $uri; // text
public $url; // text
public $uri; // varchar(191) not 255 because utf8mb4 takes more space
public $url; // varchar(191) not 255 because utf8mb4 takes more space
public $created; // datetime
public $modified; // datetime
@@ -74,17 +74,17 @@ class Blog_entry extends Managed_DataObject
'not null' => true,
'description' => 'Author profile ID'),
'title' => array('type' => 'varchar',
'length' => 255,
'length' => 191,
'description' => 'title of the entry'),
'summary' => array('type' => 'text',
'description' => 'initial summary'),
'content' => array('type' => 'text',
'description' => 'HTML content of the entry'),
'uri' => array('type' => 'varchar',
'length' => 255,
'length' => 191,
'description' => 'URI (probably http://) for this entry'),
'url' => array('type' => 'varchar',
'length' => 255,
'length' => 191,
'description' => 'URL (probably http://) for this entry'),
'created' => array('type' => 'datetime',
'not null' => true,