mirror of
https://github.com/Xkeeper0/jul.git
synced 2025-05-19 08:40:21 -07:00
[fix #18] real cool to leave that merge crap in there >_<
This commit is contained in:
parent
3df3b5e09f
commit
ff64c3cd2a
@ -68,11 +68,6 @@
|
|||||||
<br>$radio=iconid value=-1 $checked> None
|
<br>$radio=iconid value=-1 $checked> None
|
||||||
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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user