Merge branch 'master' of github.com:profplump/UberZach-Video

web/includes/config.php

@@ -1,5 +1,8 @@
 <?
 
+# Set locale to make basename() and others work reasonably
+setlocale(LC_ALL, "en_US.UTF8");
+
 ### Config
 $TV_PATH    = '/mnt/media/TV';	# Root path for all TV series
 $MAX_AGE    = 86400 * 90;		# Consider a series "old" if it has not been updated for this many seconds

web/includes/util.php

@@ -2,7 +2,7 @@
 
 # Cleanup the provided series name
 # This does NOT provide comprehensively safe output,
-# it merely attempts to make names compatible with the filesystem and local convetions
+# it merely attempts to make names compatible with the filesystem and local conventions
 function cleanSeries($series) {
 	# Clearly unreasonable characters
 	$series = preg_replace('/[\0\n\r]/', ' ', $series);