Merge branch '0.9.x'
This commit is contained in:
commit
afd42611a3
@ -102,7 +102,7 @@ class RealtimePlugin extends Plugin
|
||||
}
|
||||
else {
|
||||
$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() { '.
|
||||
|
Loading…
Reference in New Issue
Block a user