Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-06-05-06-52-23

[civicrm-core.git] / CRM / Event / Info.php

diff --git a/CRM/Event/Info.php b/CRM/Event/Info.php
index e3b595c9e3818534379063038b4d7d104a560b9c..8916cdac09b0192350430bb32b471e64bb2995d1 100644 (file)
--- a/CRM/Event/Info.php
+++ b/CRM/Event/Info.php
@@ -52,7 +52,7 @@ class CRM_Event_Info extends CRM_Core_Component_Info {
   }
 
   // docs inherited from interface
-  public function getPermissions() {
+  public function getPermissions($getAllUnconditionally = FALSE) {
     return array(
       'access CiviEvent',
       'edit event participants',
@@ -116,7 +116,7 @@ class CRM_Event_Info extends CRM_Core_Component_Info {
               'query' => "reset=1&action=add&context=standalone&mode=live",
               'ref' => 'new-participant-cc',
               'title' => $title,
-            )));        
+            )));
       }
     }
   }