diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-12 22:48:36 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-12 22:48:36 +0000 |
| commit | 973f36d480d9392c77cdcd68946a268d2cef7501 (patch) | |
| tree | ec9f9810b462545b402013ca0c0578b0e618446f | |
| parent | 0d00b531c444e514da8a6cf0d056d594c5c96ad6 (diff) | |
| download | ampache-973f36d480d9392c77cdcd68946a268d2cef7501.tar.gz ampache-973f36d480d9392c77cdcd68946a268d2cef7501.tar.bz2 ampache-973f36d480d9392c77cdcd68946a268d2cef7501.zip | |
svn merging gone wrong
| -rwxr-xr-x | docs/CHANGELOG | 1 | ||||
| -rw-r--r-- | templates/show_flagged.inc.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index ecd61c1a..ced39a8b 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,7 @@ -------------------------------------------------------------------------- v.3.3.3 + - Fixed flagging not correctly tracking user on flag creation - Added select boxes to Admin Flag pages to allow rejection or approval of all songs at once - Fixed an XMLRPC catalog issues created when I moved comments diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index 5f875b04..2324afd2 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -28,7 +28,6 @@ $web_path = conf('web_path'); <th><?php echo _('Object'); ?></th> <th><?php echo _('User'); ?></th> <th><?php echo _('Flag'); ?></th> - <th><?php echo _('Flagged by'); ?></th> <th><?php echo _('Status'); ?></th> <th><?php echo _('Action'); ?></th> </tr> @@ -40,7 +39,6 @@ $web_path = conf('web_path'); <td><?php $flag->print_name(); ?></td> <td><?php echo scrub_out($flag->user); ?></td> <td><?php $flag->print_flag(); ?></td> - <td><?php echo $flag->user; ?></td> <td><?php $flag->print_status(); ?></td> <td align="center"> <?php if ($flag->approved) { ?> |