058c30e1 by Joshua Tundag

fix

1 parent 9df6640a
...@@ -193,7 +193,7 @@ class FlagManager { ...@@ -193,7 +193,7 @@ class FlagManager {
193 $flags = $this->all(); 193 $flags = $this->all();
194 if(!$flags) return []; 194 if(!$flags) return [];
195 $filteredFlags = array_values(array_filter($flags, function($f) use ($flag, $encrypted){ 195 $filteredFlags = array_values(array_filter($flags, function($f) use ($flag, $encrypted){
196 if($f['both_usable']) return $f['encrypted_name'] == $flag || $f['name'] == $flag; 196 if(isset($f['both_usable']) && $f['both_usable']) return $f['encrypted_name'] == $flag || $f['name'] == $flag;
197 return (($encrypted && $f['encrypted_name'] == $flag) || (!$encrypted && $f['name']) == $flag); 197 return (($encrypted && $f['encrypted_name'] == $flag) || (!$encrypted && $f['name']) == $flag);
198 })); 198 }));
199 return count($filteredFlags) ? $filteredFlags[0] : null; 199 return count($filteredFlags) ? $filteredFlags[0] : null;
......
...@@ -35,7 +35,7 @@ final class FlagsTest extends TestCase ...@@ -35,7 +35,7 @@ final class FlagsTest extends TestCase
35 $flags = $this->flags; 35 $flags = $this->flags;
36 if(!$flags) return []; 36 if(!$flags) return [];
37 $filteredFlags = array_values(array_filter($flags, function($f) use ($flag, $encrypted){ 37 $filteredFlags = array_values(array_filter($flags, function($f) use ($flag, $encrypted){
38 if($f['both_usable']) return $f['encrypted_name'] == $flag || $f['name'] == $flag; 38 if(isset($f['both_usable']) && $f['both_usable']) return $f['encrypted_name'] == $flag || $f['name'] == $flag;
39 return (($encrypted && $f['encrypted_name'] == $flag) || (!$encrypted && $f['name']) == $flag); 39 return (($encrypted && $f['encrypted_name'] == $flag) || (!$encrypted && $f['name']) == $flag);
40 })); 40 }));
41 $foundFlag = count($filteredFlags) ? $filteredFlags[0] : null; 41 $foundFlag = count($filteredFlags) ? $filteredFlags[0] : null;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!