Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-21 12:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update references to the friendica/friendica stable branch

Browse source
This commit is contained in:
Hypolite Petovan 2020-06-15 13:47:23 -04:00
parent b9873a88a5
commit 9c6fbc6a74
20 changed files with 56 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Admin/Site.php
View file

@ -548,7 +548,7 @@ class Site extends BaseAdmin
$check_git_version_choices = [
'none' => DI::l10n()->t('Don\'t check'),
'master' => DI::l10n()->t('check the stable version'),
'stable' => DI::l10n()->t('check the stable version'),
'develop' => DI::l10n()->t('check the development version')
];

4
src/Module/Admin/Summary.php
View file

@ -75,8 +75,8 @@ class Summary extends BaseAdmin
}
}
// Check if github.com/friendica/master/VERSION is higher then
// the local version of Friendica. Check is opt-in, source may be master or devel branch
// Check if github.com/friendica/stable/VERSION is higher then
// the local version of Friendica. Check is opt-in, source may be stable or develop branch
if (DI::config()->get('system', 'check_new_version_url', 'none') != 'none') {
$gitversion = DI::config()->get('system', 'git_friendica_version');
if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) {

2
src/Module/BaseAdmin.php
View file

@ -76,7 +76,7 @@ abstract class BaseAdmin extends BaseModule
}
if (!empty($_SESSION['submanage'])) {
throw new ForbiddenException(DI::l10n()->t('Submanaged account can\'t access the administation pages. Please log back in as the master account.'));
throw new ForbiddenException(DI::l10n()->t('Submanaged account can\'t access the administation pages. Please log back in as the main account.'));
}
// Header stuff