summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/ampache.cfg.php.dist5
-rw-r--r--lib/class/vainfo.class.php2
2 files changed, 4 insertions, 3 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index 97af47c7..322df511 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -634,6 +634,7 @@ use_rss = true
;mb_detect_override = true
;Custom mb_detect_order
-;list comma separated
-;DEFAULT: auto
+;list comma separated, available encodings are listed on php.net.
+;see http://php.net/manual/mbstring.supported-encodings.php
+;DEFAULT: auto (use your php.ini)
;mb_detect_order = "EUC-JP, SJIS, eucJP-win, SJIS-win, JIS, ISO-2022-JP, ASCII, UTF-8, UTF-7"
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php
index feec24ef..6b2c9e67 100644
--- a/lib/class/vainfo.class.php
+++ b/lib/class/vainfo.class.php
@@ -159,7 +159,7 @@ class vainfo {
* This function just sets up the class, it doesn't
* actually pull the information
*
- * @todo Some mp3 is still broken...
+ * @todo Some mp3 is still broken... I think this is related to mb_detect_order().
* @param string $file filename
* @param string $encoding Default encode character set
* @param string $encoding_id3v1 Default id3v1 encode character set