mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2024-11-02 13:31:10 +00:00
Merge pull request #1293 from nupplaphil/feat/session_util
[various] Move Core\Session::get() to DI::session()->get()
This commit is contained in:
commit
5f1028a535
2 changed files with 4 additions and 4 deletions
|
@ -107,7 +107,7 @@ function curweather_network_mod_init(App $a, string &$body)
|
|||
$rpt = DI::pConfig()->get(local_user(), 'curweather', 'curweather_loc');
|
||||
|
||||
// Set the language to the browsers language or default and use metric units
|
||||
$lang = Session::get('language', DI::config()->get('system', 'language'));
|
||||
$lang = DI::session()->get('language', DI::config()->get('system', 'language'));
|
||||
$units = DI::pConfig()->get( local_user(), 'curweather', 'curweather_units');
|
||||
$appid = DI::config()->get('curweather', 'appid');
|
||||
$cachetime = intval(DI::config()->get('curweather', 'cachetime'));
|
||||
|
|
|
@ -63,10 +63,10 @@ function diaspora_settings(App $a, array &$data)
|
|||
|
||||
$info = '';
|
||||
$error = '';
|
||||
if (Session::get('my_address')) {
|
||||
$info = DI::l10n()->t('Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. ', Session::get('my_address'));
|
||||
if (DI::session()->get('my_address')) {
|
||||
$info = DI::l10n()->t('Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. ', DI::session()->get('my_address'));
|
||||
$info .= DI::l10n()->t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
|
||||
$info .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.', Session::get('my_address'));
|
||||
$info .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.', DI::session()->get('my_address'));
|
||||
}
|
||||
|
||||
$aspect_select = '';
|
||||
|
|
Loading…
Reference in a new issue