Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-13-16-08-08

[civicrm-core.git] / CRM / Core / Joomla.php

diff --git a/CRM/Core/Joomla.php b/CRM/Core/Joomla.php
index 0466ba0e1654845bc46d9380b7ab6c1d9f414f69..8acc7fe6120aadddaf4e6d9db4957ed05936eb9f 100644 (file)
--- a/CRM/Core/Joomla.php
+++ b/CRM/Core/Joomla.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -43,10 +43,8 @@ class CRM_Core_Joomla {
    * to the smarty instance
    *
    * @return void
-   * @access public
-   * @static
    */
-  static function sidebarLeft() {
+  public static function sidebarLeft() {
     $config = CRM_Core_Config::singleton();
 
     if ($config->userFrameworkFrontend) {
@@ -73,5 +71,5 @@ class CRM_Core_Joomla {
     $sidebarLeft = $template->fetch('CRM/Block/blocks.tpl');
     $template->assign_by_ref('sidebarLeft', $sidebarLeft);
   }
-}
 
+}