Skip to content

Php setup fix and stopping members pages being (as) slow #960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cs-endo wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Php setup fix and stopping members pages being (as) slow #960

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a21f3ce
Fixed setup error
cs-endo Oct 23, 2020
dfd34ea
Rearrange order of testing training
cs-endo Oct 23, 2020
9cc13db
Merge branch 'master' into cs-499243-patch-1
cs-endo Feb 23, 2021
3512a4e
Merge branch 'master' into cs-499243-patch-1
cs-endo Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Classes/ServiceAPI/MyRadio_TrainingStatus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ public static function getAllAwardableTo(MyRadio_User $to, MyRadio_User $by = nu

$statuses = [];
foreach (self::getAll() as $status) {
if ((!$status->isAwardedTo($to))
if ($status->canAward($by)
&& $status->hasDependency($to)
&& $status->canAward($by)
&& (!$status->isAwardedTo($to))
Comment on lines +315 to +317
Copy link
Member

@markspolakovs markspolakovs Oct 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explain?

Copy link
Contributor Author

@cs-endo cs-endo Oct 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason if you run canAward without the other tests it runs smoothly. Obviously I can't just remove the tests so I just put that one first so when that fails it doesn't test the other ones.

) {
$statuses[] = $status;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Controllers/Setup/checks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function convertPHPSizeToBytes($sSize)
$ready = false;
$problems[] = 'You must be running at least PHP 7.1.';
} else {
$successes[] = 'You are running PHP '.php_version().'.';
$successes[] = 'You are running PHP '.phpversion().'.';
}

foreach ($required_modules as $module) {
Expand Down