Merge branch 'master' into develop

ampache · Dec 5, 2019 · 21b3319 · 21b3319
2 parents c8911f4 + b2d397d
commit 21b3319
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,10 @@ cs_fixer_tmp_*
 .env
 .project
 .settings/
+
+components/
+node_modules/
+vendor/
 .vscode/
 bootstrap/
 components/

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,9 +2,26 @@
 
 ## 4.1.0-develop
 
-* Reduce the time for repeated track playback (Song length - 5)
+* Bump API version to 400003 (4.0.0 build 003)
+* Api::playlist_edit - filter mandatory. name and type now optional
+* Playlist::create - Return duplicate playlist ID instead of creating a new one
+* Artist::check - Remove MBID from Various Artists's
+* Fix Api relating to playlist access
+* Fix Song::update_song for label
+* Fix comparison bugs found during static type testing
+* Translation update from Transifex
+
+## 4.0.4
+
+* Finalize release procedure to make these updates a bit smoother
+* Reduce the time for repeated track playback (Song length - 5 sec)
 * Filter playlists in API, Web and Subsonic correctly for regular users vs admins
 * Fix album count for Artists when the album is missing data
+* Fix searches / searchbox for MYSQL8
+* Fix some invalid returns in lib/*
+* Send correct the function in ajax.server when deleting from playlist
+* Hide some lines from the mashup to make it a bit nicer
+* Remove the old logo from the main install page
 
 ## 4.0.3
 

diff --git a/docs/RELEASE-PROCESS.md b/docs/RELEASE-PROCESS.md
@@ -36,4 +36,3 @@ It's easy to use a program like github desktop to compare between branches.
 * After setting version and title, save as draft
 * Commit your waiting update to master
 * Publish the new release
-
diff --git a/lib/class/api.class.php b/lib/class/api.class.php
@@ -930,7 +930,7 @@ public static function playlists($input)
         XML_Data::set_limit($input['limit']);
 
         ob_end_clean();
-        echo XML_Data::playlists($playlist_ids);
+        echo XML_Data::playlists($playlist_ids, $user->id);
         Session::extend($input['auth']);
     } // playlists
 
@@ -993,6 +993,8 @@ public static function playlist_songs($input)
 
             return;
         }
+        if (!$playlist->type == 'public' && (!$playlist->has_access($user->id) || !Access::check('interface', 100, $user->id))) {
+            echo XML_Data::error('401', T_('Access denied to this playlist'));
 
         $items = $playlist->get_items();
         $songs = array();

diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php
diff --git a/lib/class/search.class.php b/lib/class/search.class.php
@@ -1387,6 +1387,7 @@ private function album_to_sql()
 
             switch ($rule[0]) {
                 case 'title':
+                    $group[] = "`album`.`id`";
                     $where[] = "(`album`.`name` $sql_match_operator '$input' " .
                                 " OR LTRIM(CONCAT(COALESCE(`album`.`prefix`, ''), " .
                                 "' ', `album`.`name`)) $sql_match_operator '$input')";

diff --git a/server/xml.server.php b/server/xml.server.php
@@ -79,7 +79,7 @@
     if (isset($_REQUEST['user'])) {
         $GLOBALS['user'] = User::get_from_username(Core::get_request('user'));
     } else {
-        debug_event('xml.server', 'API [' . Core::get_request('auth') . ']', 3);
+        debug_event('xml.server', 'API session [' . Core::get_request('auth') . ']', 3);
         $GLOBALS['user'] = User::get_from_username(Session::username(Core::get_request('auth')));
     }
 }