From 4db5041d66ab59a5cd8981d28e99f0a047da929f Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 18 Apr 2013 20:43:27 +0400 Subject: [PATCH 1/2] removed metions of 1.1 --- framework/web/AssetManager.php | 1 - framework/web/Response.php | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/web/AssetManager.php b/framework/web/AssetManager.php index 9a121d8..55c54d4 100644 --- a/framework/web/AssetManager.php +++ b/framework/web/AssetManager.php @@ -56,7 +56,6 @@ class AssetManager extends Component /** * @var array list of directories and files which should be excluded from the publishing process. * Defaults to exclude '.svn' and '.gitignore' files only. This option has no effect if {@link linkAssets} is enabled. - * @since 1.1.6 **/ public $excludeFiles = array('.svn', '.gitignore'); /** diff --git a/framework/web/Response.php b/framework/web/Response.php index da2482f..1d604e9 100644 --- a/framework/web/Response.php +++ b/framework/web/Response.php @@ -112,8 +112,8 @@ class Response extends \yii\base\Response *
  • mimeType: mime type of the file, if not set it will be guessed automatically based on the file name, if set to null no content-type header will be sent.
    • *
  • xHeader: appropriate x-sendfile header, defaults to "X-Sendfile"
    • *
  • terminate: whether to terminate the current application after calling this method, defaults to true
    • - *
  • forceDownload: specifies whether the file will be downloaded or shown inline, defaults to true. (Since version 1.1.9.)
    • - *
  • addHeaders: an array of additional http headers in header-value pairs (available since version 1.1.10)
    • + *
  • forceDownload: specifies whether the file will be downloaded or shown inline, defaults to true
    • + *
  • addHeaders: an array of additional http headers in header-value pairs
    • * */ public function xSendFile($filePath, $options = array()) From c006ebeb4900fa9b03bb5b4828c83b8d161c2cf7 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 18 Apr 2013 20:46:37 +0400 Subject: [PATCH 2/2] added .hgignore to list of typically ignored files --- framework/console/controllers/AppController.php | 4 ++-- framework/web/AssetManager.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/console/controllers/AppController.php b/framework/console/controllers/AppController.php index 237ba0f..a47acfe 100644 --- a/framework/console/controllers/AppController.php +++ b/framework/console/controllers/AppController.php @@ -294,7 +294,7 @@ class AppController extends Controller * @param string $targetDir the target directory * @param string $baseDir base directory * @param array $ignoreFiles list of the names of files that should - * be ignored in list building process. Argument available since 1.1.11. + * be ignored in list building process. * @param array $renameMap hash array of file names that should be * renamed. Example value: array('1.old.txt'=>'2.new.txt'). * @return array the file list (see {@link copyFiles}) @@ -304,7 +304,7 @@ class AppController extends Controller $list = array(); $handle = opendir($sourceDir); while(($file = readdir($handle)) !== false) { - if(in_array($file, array('.', '..', '.svn', '.gitignore')) || in_array($file, $ignoreFiles)) { + if(in_array($file, array('.', '..', '.svn', '.gitignore', '.hgignore')) || in_array($file, $ignoreFiles)) { continue; } $sourcePath = $sourceDir.DIRECTORY_SEPARATOR.$file; diff --git a/framework/web/AssetManager.php b/framework/web/AssetManager.php index 55c54d4..8788253 100644 --- a/framework/web/AssetManager.php +++ b/framework/web/AssetManager.php @@ -55,9 +55,9 @@ class AssetManager extends Component public $linkAssets = false; /** * @var array list of directories and files which should be excluded from the publishing process. - * Defaults to exclude '.svn' and '.gitignore' files only. This option has no effect if {@link linkAssets} is enabled. + * Defaults to exclude '.svn', '.gitignore' and '.hgignore' files only. This option has no effect if {@link linkAssets} is enabled. **/ - public $excludeFiles = array('.svn', '.gitignore'); + public $excludeFiles = array('.svn', '.gitignore', '.hgignore'); /** * @var integer the permission to be set for newly published asset files. * This value will be used by PHP chmod() function.