Merge pull request #1291 from annando/no-eol

The EOL constant is removed
This commit is contained in:
Hypolite Petovan 2022-10-18 10:16:06 -04:00 committed by GitHub
commit d267e7f0b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions

View File

@ -25,16 +25,16 @@ function newmemberwidget_network_mod_init (App $a, $b)
return;
}
$t = '<div id="newmember_widget" class="widget">'.EOL;
$t .= '<h3>'.DI::l10n()->t('New Member').'</h3>'.EOL;
$t .= '<a href="newmember" id="newmemberwidget-tips">' . DI::l10n()->t('Tips for New Members') . '</a><br />'.EOL;
$t = '<div id="newmember_widget" class="widget">';
$t .= '<h3>'.DI::l10n()->t('New Member').'</h3>';
$t .= '<a href="newmember" id="newmemberwidget-tips">' . DI::l10n()->t('Tips for New Members') . '</a><br />';
if (DI::config()->get('newmemberwidget','linkglobalsupport', false)) {
$t .= '<a href="https://forum.friendi.ca/profile/helpers" target="_new">'.DI::l10n()->t('Global Support Forum').'</a><br />'.EOL;
$t .= '<a href="https://forum.friendi.ca/profile/helpers" target="_new">'.DI::l10n()->t('Global Support Forum').'</a><br />';
}
if (DI::config()->get('newmemberwidget','linklocalsupport', false)) {
$t .= '<a href="'.DI::baseUrl()->get().'/profile/'.DI::config()->get('newmemberwidget','localsupport').'" target="_new">'.DI::l10n()->t('Local Support Forum').'</a><br />'.EOL;
$t .= '<a href="'.DI::baseUrl()->get().'/profile/'.DI::config()->get('newmemberwidget','localsupport').'" target="_new">'.DI::l10n()->t('Local Support Forum').'</a><br />';
}
$ft = DI::config()->get('newmemberwidget','freetext', '');

View File

@ -146,7 +146,7 @@ function statusnet_settings_post(App $a, $post)
DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $asn['apiurl']);
//DI::pConfig()->set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
} else {
DI::sysmsg()->addNotice(DI::l10n()->t('Please contact your site administrator.<br />The provided API URL is not valid.') . EOL . $asn['apiurl']);
DI::sysmsg()->addNotice(DI::l10n()->t('Please contact your site administrator.<br />The provided API URL is not valid.') . '<br />' . $asn['apiurl']);
}
}
}

View File

@ -248,8 +248,7 @@ function wppost_send(App $a, array &$b)
$wp_backlink = intval(DI::pConfig()->get($b['uid'],'wppost','backlink'));
if($wp_backlink && $b['plink']) {
$post .= EOL . EOL . '<a href="' . $b['plink'] . '">'
. $wp_backlink_text . '</a>' . EOL . EOL;
$post .= '<p><a href="' . $b['plink'] . '">' . $wp_backlink_text . '</a></p>';
}
$post = XML::escape($post);