summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocs/CHANGELOG4
-rw-r--r--lib/class/democratic.class.php4
-rw-r--r--server/democratic.ajax.php2
-rw-r--r--templates/show_xspf_player.inc.php2
4 files changed, 8 insertions, 4 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 6e31681e..36cb3bae 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -3,6 +3,10 @@
--------------------------------------------------------------------------
--------------------------------------------------------------------------
+ v.3.4
+ - Fixed Remove one vote, removes all votes on democratic play
+
+--------------------------------------------------------------------------
v.3.4-Beta3 04/20/2008
- Fixed Rating display and Rating Advanced Search
- Added ability to specify new Genre when adding a Radio Station
diff --git a/lib/class/democratic.class.php b/lib/class/democratic.class.php
index e91abb45..b8835766 100644
--- a/lib/class/democratic.class.php
+++ b/lib/class/democratic.class.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2008 Ampache.org
+ Copyright (c) Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
@@ -410,7 +410,7 @@ class Democratic extends tmpPlaylist {
$object_id = Dba::escape($row_id);
$user_id = Dba::escape($GLOBALS['user']->id);
- $sql = "DELETE FROM `user_vote` WHERE `object_id`='$object_id'";
+ $sql = "DELETE FROM `user_vote` WHERE `object_id`='$object_id' AND `user`='$user_id'";
$db_results = Dba::query($sql);
/* Clean up anything that has no votes */
diff --git a/server/democratic.ajax.php b/server/democratic.ajax.php
index ccb22b9c..97da2aaa 100644
--- a/server/democratic.ajax.php
+++ b/server/democratic.ajax.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
diff --git a/templates/show_xspf_player.inc.php b/templates/show_xspf_player.inc.php
index 955bcfa6..bc387f7f 100644
--- a/templates/show_xspf_player.inc.php
+++ b/templates/show_xspf_player.inc.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or