Merge branch 'maint'

Conflicts:
	web/html/account.php
	web/html/addvote.php
	web/html/pkgsubmit.php
	web/lib/acctfuncs.inc.php
	web/template/actions_form.php
	web/template/pkg_comment_form.php
	web/template/pkg_comments.php
	web/template/pkg_details.php
	web/template/pkg_search_results.php
	web/template/tu_details.php
This commit is contained in:
Lukas Fleischer 2012-07-14 22:47:04 +02:00
commit f3ce74c714
15 changed files with 78 additions and 46 deletions

View file

@ -3,6 +3,7 @@
<input type="hidden" name="Action" value="<?php echo $A ?>" />
<?php if ($UID): ?>
<input type="hidden" name="ID" value="<?php echo $UID ?>" />
<input type="hidden" name="token" value="<?php print htmlspecialchars($_COOKIE['AURSID']) ?>" /> </div>
<?php endif; ?>
</fieldset>
<table>