summaryrefslogtreecommitdiffstats
path: root/lib/eventsource.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-11-04 12:31:06 +0100
committerThomas Tanghus <thomas@tanghus.net>2012-11-04 12:31:06 +0100
commite6a7bba0950688d73f52cd622bdf6ec62dff9281 (patch)
treeaec719c0af896e1f47c0475f13ed2355dbf34f4f /lib/eventsource.php
parent8e5b6bf21d14b6022e543869cba503bb582b1cb5 (diff)
parent17d466b03b91ccc058fe1a88340df36c22a580c2 (diff)
downloadnextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.tar.gz
nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.zip
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts: lib/vcategories.php
Diffstat (limited to 'lib/eventsource.php')
-rw-r--r--lib/eventsource.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 3bada131bdd..578441ee707 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -56,7 +56,7 @@ class OC_EventSource{
*
* if only one paramater is given, a typeless message will be send with that paramater as data
*/
- public function send($type,$data=null) {
+ public function send($type, $data=null) {
if(is_null($data)) {
$data=$type;
$type=null;