diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-12-06 15:53:42 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-12-06 15:53:42 +0000 |
| commit | 286840fbcc42ea190b7700ad9a00d0aaf4acbbf2 (patch) | |
| tree | 2fe39ef615adf45ebeae645fe7382cddbfe4d963 | |
| parent | a2c8bf9d481376f7fbfeecee4db174d1f7e6bd52 (diff) | |
| download | ampache-286840fbcc42ea190b7700ad9a00d0aaf4acbbf2.tar.gz ampache-286840fbcc42ea190b7700ad9a00d0aaf4acbbf2.tar.bz2 ampache-286840fbcc42ea190b7700ad9a00d0aaf4acbbf2.zip | |
added execution time override test, and tweaked when it falls back to recording_time in id3v2 tags
| -rw-r--r-- | modules/getid3/module.tag.id3v2.php | 4 | ||||
| -rw-r--r-- | templates/show_debug.inc.php | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/getid3/module.tag.id3v2.php b/modules/getid3/module.tag.id3v2.php index 16a9575f..deaa5abc 100644 --- a/modules/getid3/module.tag.id3v2.php +++ b/modules/getid3/module.tag.id3v2.php @@ -451,8 +451,8 @@ class getid3_id3v2 extends getid3_handler } } - // Use year from recording time if year not set - if (!isset($info_id3v2['comments']['year']) && ereg('^([0-9]{4})', @$info_id3v2['comments']['recording_time'][0], $matches)) { + // Use year from recording time if year is empty + if (!strlen($info_id3v2['comments']['year']) && ereg('^([0-9]{4})', @$info_id3v2['comments']['recording_time'][0], $matches)) { $info_id3v2['comments']['year'] = array ($matches[1]); } diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php index 62362908..a3b0490a 100644 --- a/templates/show_debug.inc.php +++ b/templates/show_debug.inc.php @@ -45,6 +45,10 @@ <td><?php echo ini_get('max_execution_time'); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> + <td><?php echo _('Override Execution Time'); ?></td> + <td><?php set_time_limit(0); echo ini_get('max_execution_time') ? _('Failed') : _('Succeeded'); ?></td> +</tr> +<tr class="<?php echo flip_class(); ?>"> <td><?php echo _('Safe Mode'); ?></td> <td><?php echo print_boolean(ini_get('safe_mode')); ?></td> </tr> |