Skip to content
Permalink
Browse files

merge old master commits back into develop

There were some diversions that had been generated previously making some minor code differences.
  • Loading branch information
lachlan-00 committed Dec 5, 2019
1 parent 21b3319 commit 2973d629e1bab291501bf969d1530d37c965d10c
Showing with 33 additions and 40 deletions.
  1. +32 −36 .gitignore
  2. +1 −3 lib/class/api.class.php
  3. +0 −1 lib/class/search.class.php
@@ -1,48 +1,44 @@
/config/ampache.cfg.php
/config/ampache-doped.cfg.php
/rest/.htaccess
/play/.htaccess
/.maintenance
/channel/.htaccess
*.phpproj
*.sln
*.v11.suo
*.suo
/logs/
/config/ampache-doped.cfg.php
/config/ampache.cfg.php
/config/registration_agreement.php
/lib/components/
/lib/vendor/
/log/
/logs/
/modules/plugins/ampache-*
/nbproject/private/
.pc
/play/.htaccess
/rest/.htaccess
/tmp/
*~
*#
*.log
/lib/vendor/
/lib/components/
web.config
/config/registration_agreement.php
/.maintenance
/modules/plugins/ampache-*
robots.txt
php-cs-fixer.phar
.php_cs.cache
cs_fixer_tmp_*
.buildpath
.env
.project
.settings/

components/
node_modules/
vendor/
.vscode/
bootstrap/
components/
core/
cs_fixer_tmp_*
develop/
master/
node_modules/
php-cs-fixer.phar
public/
resources/
robots.txt
storage/
vendor/
core/
develop/
master/
*.swp
.buildpath
.env
.pc
.php_cs.cache
.project
.settings/
.vscode/
web.config
*#
*.log
*.phpproj
*.save
*.sln
*.suo
*.swp
*.v11.suo
*~
@@ -930,7 +930,7 @@ public static function playlists($input)
XML_Data::set_limit($input['limit']);

ob_end_clean();
echo XML_Data::playlists($playlist_ids, $user->id);
echo XML_Data::playlists($playlist_ids);
Session::extend($input['auth']);
} // playlists

@@ -993,8 +993,6 @@ 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();
@@ -1387,7 +1387,6 @@ 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')";

0 comments on commit 2973d62

Please sign in to comment.
You can’t perform that action at this time.