Merge branch 'master' into trinidad

2015-01-05 14:41:08 -08:00
parent ed19984534 3df3ab5630
commit 8a3ef177ce
213 changed files with 4160 additions and 15625 deletions
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -421,7 +421,7 @@ function widget_affinity($arr) {
 	if(feature_enabled(local_user(),'affinity')) {
 		$tpl = get_markup_template('main_slider.tpl');
 		$x = replace_macros($tpl,array(
-			'$val' => $cmin . ';' . $cmax,
+			'$val' => $cmin . ',' . $cmax,
 			'$refresh' => t('Refresh'),
 			'$me' => t('Me'),
 			'$intimate' => t('Best Friends'),