Failed Conditions
Pull Request — master (#353)
by Florian
05:07
created
pages/pokemon.page.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -316,11 +316,11 @@
 block discarded – undo
316 316
 								<img src="core/img/arrow<?=$obj->array_sufix?>.png" alt="Arrow" class="img">
317 317
 								<p class="pkmn-name">
318 318
 									<?php
319
-                                    if (isset($obj->candies)) {
320
-                                        echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
321
-                                    } else {
322
-                                        echo '? ' . $locales->POKEMON_CANDIES;
323
-                                    }
319
+									if (isset($obj->candies)) {
320
+										echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
321
+									} else {
322
+										echo '? ' . $locales->POKEMON_CANDIES;
323
+									}
324 324
 
325 325
 									if (isset($obj->item)) {
326 326
 										$itemName = 'ITEM_' . $obj->item;
Please login to merge, or discard this patch.
core/js/trainer.graph.js.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 $trainer_lvl = [];
29 29
 # For all 3 teams
30 30
 for ($teamid = 1; $teamid <= 3; $teamid++) {
31
-    $data = $manager->getTrainerLevelCount($teamid);
31
+	$data = $manager->getTrainerLevelCount($teamid);
32 32
 	$trainer_lvl[$teamid] = $data;
33 33
 }
34 34
 
Please login to merge, or discard this patch.
core/process/queries/QueryManagerMysqlMonocleAlternate.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -540,9 +540,9 @@
 block discarded – undo
540 540
 		$trainers = array();
541 541
 		while ($data = $result->fetch_object()) {
542 542
 			$data->last_seen = date("Y-m-d", strtotime($data->last_seen));
543
-            if (is_null($data->active)) {
544
-                $data->active = 0;
545
-            }
543
+			if (is_null($data->active)) {
544
+				$data->active = 0;
545
+			}
546 546
 			$trainers[$data->name] = $data;
547 547
 
548 548
 			$pokemon = array_merge($this->getActivePokemon($data->name),  $this->getInactivePokemon($data->name));
Please login to merge, or discard this patch.