Merge pull request #2306 from totten/master-hook-jimport

CRM_Utils_Hook_Joomla - Fix error loading JPluginHelper in Joomla 3.2

CRM/Core/CodeGen/Util/Template.php

@@ -56,7 +56,7 @@ class CRM_Core_CodeGen_Util_Template {
     unlink($outpath);
     foreach ($inputs as $infile) {
       // FIXME: does not beautify.  Document.
-      file_put_contents($outpath, $this->smarty->fetch($infile), FILE_APPEND);
+      file_put_contents($outpath, $this->smarty->fetch($infile) ."\n", FILE_APPEND);
     }
   }
 

CRM/Utils/Hook/Joomla.php

@@ -44,6 +44,7 @@ class CRM_Utils_Hook_Joomla extends CRM_Utils_Hook {
     if (defined('_JEXEC')) {
       //Invoke the Joomla plugin system to observe to civicrm events.
       jimport('joomla.plugin.helper');
+      jimport('cms.plugin.helper'); // Joomla 3.2
       JPluginHelper::importPlugin('civicrm');
 
       // get app based on cli or web