Merge branch '0.9.x'

This commit is contained in:
Evan Prodromou 2011-07-30 07:49:05 -04:00
commit afd42611a3

View File

@ -102,7 +102,7 @@ class RealtimePlugin extends Plugin
} }
else { else {
$pluginPath = common_path('plugins/Realtime/'); $pluginPath = common_path('plugins/Realtime/');
$realtimeUI = ' RealtimeUpdate.initActions("'.$url.'", "'.$timeline.'", "'. $pluginPath .'");'; $realtimeUI = ' RealtimeUpdate.initActions('.json_encode($url).', '.json_encode($timeline).', '. json_encode($pluginPath).');';
} }
$script = ' $(document).ready(function() { '. $script = ' $(document).ready(function() { '.