Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-03-23-44-14

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

diff --git a/CRM/Admin/Page/Access.php b/CRM/Admin/Page/Access.php
index acdd2a03bf4be70370ab5f706931756c0dfd031e..e6f704708b397a61fe4ed255ff87870602998d99 100644 (file)
--- a/CRM/Admin/Page/Access.php
+++ b/CRM/Admin/Page/Access.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -38,7 +38,10 @@
  * For initial version, this page only contains static links - so this class is empty for now.
  */
 class CRM_Admin_Page_Access extends CRM_Core_Page {
-  function run() {
+  /**
+   * @return string
+   */
+  public function run() {
     $config = CRM_Core_Config::singleton();
 
     switch ($config->userFramework) {
@@ -52,7 +55,7 @@ class CRM_Admin_Page_Access extends CRM_Core_Page {
 
       case 'Joomla':
         //condition based on Joomla version; <= 2.5 uses modal window; >= 3.0 uses full page with return value
-        if( version_compare(JVERSION, '3.0', 'lt') ) {
+        if (version_compare(JVERSION, '3.0', 'lt')) {
           JHTML::_('behavior.modal');
           $url = $config->userFrameworkBaseURL . 'index.php?option=com_config&view=component&component=com_civicrm&tmpl=component';
           $jparams = 'rel="{handler: \'iframe\', size: {x: 875, y: 550}, onClose: function() {}}" class="modal"';
@@ -76,5 +79,5 @@ class CRM_Admin_Page_Access extends CRM_Core_Page {
     }
     return parent::run();
   }
-}
 
+}