[fix #18] real cool to leave that merge crap in there >_<

This commit is contained in:
Xkeeper 2018-11-04 14:52:20 -08:00
parent 3df3b5e09f
commit ff64c3cd2a
No known key found for this signature in database
GPG Key ID: 397C04773ABE4045

View File

@ -68,11 +68,6 @@
<br>$radio=iconid value=-1 $checked>&nbsp;None&nbsp; &nbsp; &nbsp; <br>$radio=iconid value=-1 $checked>&nbsp;None&nbsp; &nbsp; &nbsp;
Custom: $inpt=custposticon SIZE=40 MAXLENGTH=100 VALUE=\"". stripslashes($custposticon) ."\"> Custom: $inpt=custposticon SIZE=40 MAXLENGTH=100 VALUE=\"". stripslashes($custposticon) ."\">
"; ";
<<<<<<< Updated upstream
$subject=htmlspecialchars($subject);
$question=htmlspecialchars($question);
=======
>>>>>>> Stashed changes
if ($nosmilies) $nosmilieschk = " checked"; if ($nosmilies) $nosmilieschk = " checked";
if ($nohtml) $nohtmlchk = " checked"; if ($nohtml) $nohtmlchk = " checked";
@ -289,12 +284,6 @@
$tccell2ls colspan=3>Multi-voting is $mlt. $tccell2ls colspan=3>Multi-voting is $mlt.
$tblend<br>$tblstart $tblend<br>$tblstart
"; ";
<<<<<<< Updated upstream
$subject = htmlspecialchars(stripslashes($subject));
$question = htmlspecialchars(stripslashes($question));
$briefing = htmlspecialchars(stripslashes($briefing));
=======
>>>>>>> Stashed changes
} }
loadtlayout(); loadtlayout();
$ppost=$user; $ppost=$user;