Merge pull request #9141 from twomice/CRM-19414_extensions_get_api_details

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

diff --git a/CRM/Extension/Manager.php b/CRM/Extension/Manager.php
index 1209258642833d772e2fd01c1c98c02772392c69..e2de1c72eafeb4e090d9020d7dd5539c84c2a123 100644 (file)
--- a/CRM/Extension/Manager.php
+++ b/CRM/Extension/Manager.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -30,9 +30,7 @@
  * uninstalling extensions.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
+ * @copyright CiviCRM LLC (c) 2004-2016
  */
 class CRM_Extension_Manager {
   /**
@@ -121,7 +119,6 @@ class CRM_Extension_Manager {
    *
    * @param string $tmpCodeDir
    *   Path to a local directory containing a copy of the new (inert) code.
-   * @return void
    * @throws CRM_Extension_Exception
    */
   public function replace($tmpCodeDir) {
@@ -204,7 +201,6 @@ class CRM_Extension_Manager {
    *
    * @param array $keys
    *   List of extension keys.
-   * @return void
    * @throws CRM_Extension_Exception
    */
   public function install($keys) {
@@ -244,10 +240,11 @@ class CRM_Extension_Manager {
     $this->statuses = NULL;
     $this->mapper->refresh();
     CRM_Core_Invoke::rebuildMenuAndCaches(TRUE);
+    $schema = new CRM_Logging_Schema();
+    $schema->fixSchemaDifferences();
 
     foreach ($keys as $key) {
       list ($info, $typeManager) = $this->_getInfoTypeHandler($key); // throws Exception
-      //print_r(array('post post?', $info, 'k' => $key, 'os'=> $origStatuses[$key]));
 
       switch ($origStatuses[$key]) {
         case self::STATUS_INSTALLED:
@@ -276,7 +273,6 @@ class CRM_Extension_Manager {
    *
    * @param array $keys
    *   List of extension keys.
-   * @return void
    * @throws CRM_Extension_Exception
    */
   public function enable($keys) {
@@ -288,7 +284,6 @@ class CRM_Extension_Manager {
    *
    * @param array $keys
    *   List of extension keys.
-   * @return void
    * @throws CRM_Extension_Exception
    */
   public function disable($keys) {
@@ -337,7 +332,6 @@ class CRM_Extension_Manager {
    *
    * @param array $keys
    *   List of extension keys.
-   * @return void
    * @throws CRM_Extension_Exception
    */
   public function uninstall($keys) {