summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2010-02-03 02:20:19 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2010-02-03 02:20:19 +0000
commit218a07718cf15c89d10f6a79c1b9f0a479add41d (patch)
treeee793d144763a140042d9ea3a3ee199f77fa0910
parent3820eba1067f149d2680b81b40211613cb98e10b (diff)
downloadampache-218a07718cf15c89d10f6a79c1b9f0a479add41d.tar.gz
ampache-218a07718cf15c89d10f6a79c1b9f0a479add41d.tar.bz2
ampache-218a07718cf15c89d10f6a79c1b9f0a479add41d.zip
sync of acl edit fix from r2274
-rwxr-xr-xdocs/CHANGELOG2
-rw-r--r--templates/show_edit_access.inc.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index b9327f92..5241bb38 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,7 +4,7 @@
--------------------------------------------------------------------------
v.3.6-Alpha1
- - Fix catalog size math for catalogs up to 4TB (Thx Joost.t.Hart@planet.nl
+ - Fix catalog size math for catalogs up to 4TB (Thx Joost.t.Hart@planet.nl)
- Fix httpq not correctly skipping to new song
- Fix refreshing of localplay playlist when an item is skipped to
- Fix missing Content-Disposition filename= on non-transcoded songs
diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php
index da137ccd..55f9a009 100644
--- a/templates/show_edit_access.inc.php
+++ b/templates/show_edit_access.inc.php
@@ -80,7 +80,7 @@
</tr>
</table>
<div class="formValidation">
- <?php Core::form_register('edit_acl'); ?>
+ <?php echo Core::form_register('edit_acl'); ?>
<input type="submit" value="<?php echo _('Update'); ?>" />
</div>
</form>