|
@@ -159,17 +159,17 @@ |
|
|
block discarded – undo |
|
159
|
159
|
foreach (array_keys($this->typeDb) as $name) { |
|
160
|
160
|
if ($className === 0) { |
|
161
|
161
|
$tempArray[] = $name; |
|
162
|
|
- } elseif (preg_match('/^' . $className . ':/', $name) > 0) { |
|
|
162
|
+ } elseif (preg_match('/^'.$className.':/', $name) > 0) { |
|
163
|
163
|
$tempArray[] = $name; |
|
164
|
164
|
} |
|
165
|
165
|
} |
|
166
|
166
|
$returnArray = $tempArray; |
|
167
|
167
|
// remove silverbullet-specific options if this deployment is not SB |
|
168
|
168
|
foreach ($tempArray as $key => $val) { |
|
169
|
|
- if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) { |
|
|
169
|
+ if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) { |
|
170
|
170
|
unset($returnArray[$key]); |
|
171
|
171
|
} |
|
172
|
|
- if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) { |
|
|
172
|
+ if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) { |
|
173
|
173
|
unset($returnArray[$key]); |
|
174
|
174
|
} |
|
175
|
175
|
} |
Please login to merge, or discard this patch.