Merge branch 'master' into findById

[civicrm-core.git] / CRM / Admin / Page / Tag.php

diff --git a/CRM/Admin/Page/Tag.php b/CRM/Admin/Page/Tag.php
index 0214b9e5c11e00cde3d2a8a759c060f19ce3a93e..b8b3a6490d089ca9fe2055c875b3e7c3fd8846ce 100644 (file)
--- a/CRM/Admin/Page/Tag.php
+++ b/CRM/Admin/Page/Tag.php
@@ -135,7 +135,10 @@ class CRM_Admin_Page_Tag extends CRM_Core_Page_Basic {
   }
 
   /**
-   * override function browse()
+   * Override function browse()
+   * 
+   * @param null $action
+   * @param null $sort
    */
   function browse($action = NULL, $sort = NULL) {
     $adminTagSet = FALSE;