fix conflict

This commit is contained in:
lutranf
2014-08-29 10:32:11 +02:00
parent 52d117316f
commit fd7e75bb46
2 changed files with 2 additions and 2 deletions

View File

@@ -1146,7 +1146,7 @@ class Databap extends PhpObject
$asTable['title'] = self::getTableFormat($asTable['title']);
$asTable['description'] = self::getDescriptionFormat($asTable['description']);
$asTable['led'] = self::getDateFormat($asTable['led']);
//$asTable['keywords'] = ToolBox::findReplaceLinks($asTable['description']);
$asTable['formatted_keywords'] = ToolBox::findReplaceLinks($asTable['keywords']);
}
return $asTable;
}