Skip to content

Commit

Permalink
minor issues
Browse files Browse the repository at this point in the history
  • Loading branch information
lachlan-00 committed Jul 19, 2021
1 parent dd927a2 commit a182b38
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ robots.txt
web.config
phpcbf*
phpcs*
error_log
*#
*.log
*.phpproj
Expand Down
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ This means Ampache now **requires** php-intl module/dll to be enabled.
* Add 'catalog' to artist and album search
* Add 'favorite_album', 'favorite_artist' to song search
* Add 'release_status' to album search
* Add 5 and 10 to the Maximum Results limit
* Database 5.0.0 Build 10:
* Add `song_count`, `album_count`, `album_group_count` to artist table
* Add `release_status`, `addition_time`, `catalog`, `song_count`, `artist_count` to album table
Expand Down
9 changes: 4 additions & 5 deletions public/templates/browse_filters.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
<?php
} // if playlist_type?>
<?php if (in_array('object_type', $allowed_filters)) { ?>
<?php $string = 'otype_' . $browse->get_filter('object_type');
${$string} = 'selected="selected"'; ?>
<?php $string = 'otype_' . $browse->get_filter('object_type');
${$string} = 'selected="selected"'; ?>
<input id="typeSongRadio" type="radio" name="object_type" value="1" <?php echo $otype_song; ?>/>
<label id="typeSongLabel" for="typeSongRadio"><?php echo T_('Song Title'); ?></label><br />
<?php echo Ajax::observe('typeSongRadio', 'click', Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=song', '')); ?>
Expand All @@ -88,9 +88,8 @@
<label id="catalogLabel" for="catalog_select"><?php echo T_('Catalog'); ?></label><br />
<select id="catalog_select" name="catalog_key">
<option value="0"><?php echo T_('All'); ?></option>
<?php
$sql = 'SELECT `id`, `name` FROM `catalog`';
$db_results = Dba::read($sql);
<?php $sql = 'SELECT `id`, `name` FROM `catalog`';
$db_results = Dba::read($sql);
while ($data = Dba::fetch_assoc($db_results)) {
$results[] = $data;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Module/Application/Batch/DefaultAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ private function getMediaFiles(array $media_ids)
$type = $element['object_type'];
$mediaid = $element['object_id'];
} else {
$type = array_shift($element);
$mediaid = array_shift($element);
$type = array_shift($element);
$mediaid = array_shift($element);
}
$class_name = ObjectTypeToClassNameMapper::map($type);
$media = new $class_name($mediaid);
Expand Down

0 comments on commit a182b38

Please sign in to comment.