diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-25 19:20:47 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-25 19:20:47 -0500 |
| commit | 0c66442b559a350527aa35155ec965a2901cafbc (patch) | |
| tree | 338214a3abdf18d43f3df1e7a238eb49bc0fb0bc /admin | |
| parent | 9a83f50042925e0daa0aab1b44fcc8d39e79edf2 (diff) | |
| download | ampache-0c66442b559a350527aa35155ec965a2901cafbc.tar.gz ampache-0c66442b559a350527aa35155ec965a2901cafbc.tar.bz2 ampache-0c66442b559a350527aa35155ec965a2901cafbc.zip | |
require and require_once aren't functions
Since the parentheses are optional, we leave them off to remind ourselve
that PHP be crazy, yo.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/catalog.php | 8 | ||||
| -rw-r--r-- | admin/flag.php | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index 3a4ea938..b8eac41b 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -35,7 +35,7 @@ switch ($_REQUEST['action']) { /* Does this use now? */ delete_flagged($flag); $type = 'show_flagged_songs'; - include(conf('prefix') . '/templates/flag.inc'); + require Config::get('prefix') . '/templates/flag.inc'; break; case 'add_to_all_catalogs': $catalog = new Catalog(); @@ -123,7 +123,7 @@ switch ($_REQUEST['action']) { show_confirmation(T_('Catalog Delete'), T_('Confirm Deletion Request'),$next_url,1,'delete_catalog'); break; case 'remove_disabled': - if (conf('demo_mode')) { break; } + if (Config::get('demo_mode')) { break; } $song = $_REQUEST['song']; @@ -272,11 +272,11 @@ switch ($_REQUEST['action']) { break; case 'show_disabled': /* Stop the demo hippies */ - if (conf('demo_mode')) { break; } + if (Config::get('demo_mode')) { break; } $songs = $catalog->get_disabled(); if (count($songs)) { - require (conf('prefix') . '/templates/show_disabled_songs.inc.php'); + require Config::get('prefix') . '/templates/show_disabled_songs.inc.php'; } else { echo "<div class=\"error\" align=\"center\">" . T_('No Disabled songs found') . "</div>"; diff --git a/admin/flag.php b/admin/flag.php index ffbc6655..9cce736d 100644 --- a/admin/flag.php +++ b/admin/flag.php @@ -85,7 +85,7 @@ switch ($_REQUEST['action']) { $album = new Album($_REQUEST['album_id']); - require_once(conf('prefix') . '/templates/show_edit_album.inc.php'); + require_once Config::get('prefix') . '/templates/show_edit_album.inc.php'; break; // Update all songs from this album @@ -128,7 +128,7 @@ switch ($_REQUEST['action']) { $artist = new Artist($_REQUEST['artist_id']); - require_once(conf('prefix') . '/templates/show_edit_artist.inc.php'); + require_once Config::get('prefix') . '/templates/show_edit_artist.inc.php'; break; // Update all songs by this artist @@ -255,7 +255,7 @@ switch ($_REQUEST['action']) { $song = new Song($_REQUEST['song']); $song->fill_ext_info(); $song->format_song(); - require_once (conf('prefix') . '/templates/show_edit_song.inc.php'); + require_once Config::get('prefix') . '/templates/show_edit_song.inc.php'; break; case 'disable': $song_obj = new Song(); |