Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-26 13:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix failed auto-merge.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-05-12 22:52:18 +02:00
parent b7d74ff772
commit 1fe6d18838
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
settings.php
View File

@@ -905,21 +905,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
<input type="radio" name="tempunit" value="K" id="tempunit_K" <?php if ($temperatureunit === "K"){ ?>checked<?php } ?>><label for="tempunit_K">&nbsp;Kelvin</label><br>
<input type="radio" name="tempunit" value="F" id="tempunit_F" <?php if ($temperatureunit === "F"){ ?>checked<?php } ?>><label for="tempunit_F">&nbsp;Fahrenheit</label>
<h4>Administrator Email Address</h4>
<<<<<<< HEAD
<div class="form-group">
<<<<<<< HEAD
<div class="input-group">
<input type="email" class="form-control" name="adminemail"
value="<?php echo htmlspecialchars($adminemail); ?>">
</div>
=======
<input type="text" class="form-control" name="adminemail"
value="<?php echo htmlspecialchars($adminemail); ?>">
>>>>>>> master
</div>
=======
<input type="text" class="form-control" name="adminemail" value="<?php echo htmlspecialchars($adminemail); ?>">
>>>>>>> Add custom checkboxes.
<input type="email" class="form-control" name="adminemail" value="<?php echo htmlspecialchars($adminemail); ?>">
<input type="hidden" name="field" value="webUI">
<input type="hidden" name="token" value="<?php echo $token ?>">
</div>