tobias/friendica-directory
1
0
Fork 0
forked from friendica/friendica-directory
Code Issues Pull requests Releases Wiki Activity

Update references to friendica/friendica-directory stable branch

Browse source
This commit is contained in:
Hypolite Petovan 2020-06-15 13:50:53 -04:00
parent 30bdf306ba
commit ad6db150c5
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/CONTRIBUTING.md vendored
View file

@ -4,7 +4,7 @@
1. Fork the repository 1. Fork the repository
2. Create a new branch for each feature or improvement 2. Create a new branch for each feature or improvement
3. Send a pull request from each feature branch to the master branch 3. Send a pull request from each feature branch to the stable branch
It is very important to separate new features or improvements into separate feature branches, and to send a It is very important to separate new features or improvements into separate feature branches, and to send a
pull request for each branch. This allows us to review and pull in new features or improvements individually. pull request for each branch. This allows us to review and pull in new features or improvements individually.

2
src/classes/Controllers/Web/Servers.php
View file

@ -46,7 +46,7 @@ class Servers extends BaseController
{ {
$stable_version = $this->simplecache->get('stable_version'); $stable_version = $this->simplecache->get('stable_version');
if (!$stable_version) { if (!$stable_version) {
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION')); $stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION'));
$this->simplecache->set('stable_version', $stable_version); $this->simplecache->set('stable_version', $stable_version);
} }

2
src/classes/Controllers/Web/Statistics.php
View file

@ -55,7 +55,7 @@ class Statistics extends BaseController
$stable_version = $this->simplecache->get('stable_version'); $stable_version = $this->simplecache->get('stable_version');
if (!$stable_version) { if (!$stable_version) {
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION')); $stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION'));
$this->simplecache->set('stable_version', $stable_version); $this->simplecache->set('stable_version', $stable_version);
} }

2
src/classes/Pollers/Server.php
View file

@ -355,7 +355,7 @@ class Server
} else { } else {
$stable_version = $this->simplecache->get('stable_version'); $stable_version = $this->simplecache->get('stable_version');
if (!$stable_version) { if (!$stable_version) {
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION')); $stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION'));
$this->simplecache->set('stable_version', $stable_version); $this->simplecache->set('stable_version', $stable_version);
} }