All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit dbac0511 authored by Leigh B Stoller's avatar Leigh B Stoller

Remove more debugging code, fix test to enable new extend code.

parent 1fbde553
......@@ -308,8 +308,8 @@ function Do_RequestExtension()
$project = Project::Lookup($instance->pid_idx());
if ($project) {
$group = $project->DefaultGroup();
if (ISADMINISTRATOR() ||
!FeatureEnabled("NewPortalExtend", $this_user, $group)) {
if (!(ISADMINISTRATOR() ||
FeatureEnabled("NewPortalExtend", $this_user, $group))) {
TBERROR("Using old extension code", 0);
return Do_RequestExtensionOld();
}
......@@ -373,7 +373,6 @@ function Do_RequestExtension()
if (isset($filename)) {
unlink($filename);
}
SUEXECERROR(SUEXEC_ACTION_CONTINUE);
if ($retval != 0) {
if ($webtask->exited()) {
SPITAJAX_ERROR($webtask->exitcode(), $webtask->TaskValue("output"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment