Merge branch 'develop' into pr/new-config-format

Conflicts:
	classes/context/Context.class.php
This commit is contained in:
Kijin Sung 2016-02-05 19:37:10 +09:00
commit 5afefc063c
42 changed files with 435 additions and 58 deletions

View file

@ -610,6 +610,7 @@ class documentController extends document
$obj->homepage = $source_obj->get('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(strip_tags($obj->content),20,'...');
// If no tile extracted from the contents, leave it untitled.