Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-01-20-54-24

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

diff --git a/CRM/Extension/Downloader.php b/CRM/Extension/Downloader.php
index ad09f32f1de5ad68241fdaaf703293e2911a8897..3f166c87cce4b3d9ae7e3b75c09e14dade9e1b11 100644 (file)
--- a/CRM/Extension/Downloader.php
+++ b/CRM/Extension/Downloader.php
@@ -45,6 +45,7 @@ class CRM_Extension_Downloader {
   public $tmpDir;
 
   /**
+   * @param CRM_Extension_Manager $manager
    * @param string $containerDir the place to store downloaded & extracted extensions
    * @param string $tmpDir
    */
@@ -185,6 +186,9 @@ class CRM_Extension_Downloader {
   /**
    * Validate that $extractedZipPath contains valid for extension $key
    *
+   * @param $key
+   * @param $extractedZipPath
+   *
    * @return bool
    */
   function validateFiles($key, $extractedZipPath) {