Skip to content

Commit

Permalink
fixed para.admins option not compatible with comma-separated list use…
Browse files Browse the repository at this point in the history
…d in Scoold Pro
  • Loading branch information
albogdano committed Feb 28, 2022
1 parent 1447eca commit 41d1dcd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,9 @@
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.9.0.2155</version>
<version>3.9.1.2184</version>
</plugin>
</plugins>
</build>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/erudika/scoold/utils/ScooldUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package com.erudika.scoold.utils;

import com.erudika.para.core.utils.Para;
import com.erudika.para.client.ParaClient;
import com.erudika.para.core.Address;
import com.erudika.para.core.ParaObject;
Expand All @@ -26,10 +25,11 @@
import com.erudika.para.core.User;
import com.erudika.para.core.Vote;
import com.erudika.para.core.Webhook;
import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.core.email.Emailer;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Para;
import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.core.utils.Utils;
import com.erudika.para.core.validation.ValidationUtils;
import com.erudika.scoold.ScooldServer;
Expand Down Expand Up @@ -96,8 +96,8 @@
import javax.validation.ConstraintViolation;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.RegExUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -217,7 +217,7 @@ static void setInstance(ScooldUtils instance) {
APPROVED_DOMAINS.add(approvedDomains);
}
// multiple admins are now allowed only in Scoold PRO
String admins = Config.getConfigParam("admins", "");
String admins = StringUtils.substringBefore(Config.getConfigParam("admins", ""), ",");
if (!StringUtils.isBlank(admins)) {
ADMINS.add(admins);
}
Expand Down

0 comments on commit 41d1dcd

Please sign in to comment.