Merge remote-tracking branch 'upstream/develop' into archive-contact

This commit is contained in:
Michael 2017-12-04 19:05:53 +00:00
commit 3bb53967f4
32 changed files with 864 additions and 767 deletions

View file

@ -4,6 +4,7 @@
*/
use Friendica\App;
use Friendica\ParseUrl;
use Friendica\Content\Feature;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\Worker;
@ -2359,7 +2360,7 @@ function posted_dates($uid, $wall) {
function posted_date_widget($url, $uid, $wall) {
$o = '';
if (! feature_enabled($uid, 'archives')) {
if (! Feature::isEnabled($uid, 'archives')) {
return $o;
}