Merge branch 'develop' into fix/thumbnail-race-condition

This commit is contained in:
Kijin Sung 2015-09-17 14:23:38 +09:00
commit 8d92b0eeb9
16 changed files with 139 additions and 84 deletions

View file

@ -274,6 +274,7 @@ class documentController extends document
$obj->homepage = $logged_info->homepage;
}
// If the tile is empty, extract string from the contents.
$obj->title = htmlspecialchars($obj->title);
settype($obj->title, "string");
if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
// If no tile extracted from the contents, leave it untitled.