Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-02-18-36-16

[civicrm-core.git] / CRM / Extension / Browser.php

diff --git a/CRM/Extension/Browser.php b/CRM/Extension/Browser.php
index 4171112a189eb20ac47999de9f2705ef63ca742f..84d0b5511631ec2854d1ff7af18a9d64dab98918 100644 (file)
--- a/CRM/Extension/Browser.php
+++ b/CRM/Extension/Browser.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * This class glues together the various parts of the extension
@@ -219,9 +219,9 @@ class CRM_Extension_Browser {
    * Connects to public server and grabs the list of publically available
    * extensions.
    *
-   * @access public
    *
-   * @return Array list of extension names
+   * @return array
+   *   list of extension names
    */
   private function grabRemoteKeyList() {
 
@@ -263,10 +263,10 @@ class CRM_Extension_Browser {
     if (empty($exts)) {
       $config = CRM_Core_Config::singleton();
       CRM_Core_Session::setStatus(ts('There are currently no extensions on the CiviCRM public extension directory which are compatible with version %2 (<a href="%1">requested extensions from here</a>). If you want to install an extension which is not marked as compatible, you may be able to <a href="%3">download and install extensions manually</a> (depending on access to your web server).<br />', array(
-            1 => $this->getRepositoryUrl(),
-            2 => $config->civiVersion,
-            3 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Extensions',
-          )), ts('No Extensions Available for this Version'), 'info');
+        1 => $this->getRepositoryUrl(),
+        2 => $config->civiVersion,
+        3 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Extensions',
+      )), ts('No Extensions Available for this Version'), 'info');
     }
 
     ini_restore('allow_url_fopen');