Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

added .gitignore to exclude list

  • Loading branch information...
commit c4a089a5572cc4edc02d0c1e281c15918366f293 1 parent 2b2ab62
@mdomba mdomba authored
View
2  UPGRADE
@@ -13,7 +13,7 @@ General upgrade intructions
---------------------------
- Make a backup.
- Clean up your 'assets' folder.
-- Replace 'framework' dir with the new one or point SVN to a fresh
+- Replace 'framework' dir with the new one or point GIT to a fresh
release and update.
- Check if everything is OK, if not — revert from backup and post
issues to Yii issue tracker.
View
5 framework/gii/generators/module/ModuleCode.php
@@ -55,7 +55,10 @@ public function prepare()
);
$files=CFileHelper::findFiles($templatePath,array(
- 'exclude'=>array('.svn'),
+ 'exclude'=>array(
+ '.svn',
+ '.gitignore'
+ ),
));
foreach($files as $file)
View
3  framework/messages/config.php
@@ -8,9 +8,10 @@
'messagePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'messages',
'languages'=>array('zh_cn','zh_tw','de','el','es','sv','he','nl','pt','pt_br','ru','it','fr','ja','pl','hu','ro','id','vi','bg','lv','sk','uk'),
'fileTypes'=>array('php'),
- 'overwrite'=>true,
+ 'overwrite'=>true,
'exclude'=>array(
'.svn',
+ '.gitignore',
'yiilite.php',
'yiit.php',
'/i18n/data',
View
4 framework/web/CAssetManager.php
@@ -59,10 +59,10 @@ class CAssetManager extends CApplicationComponent
public $linkAssets=false;
/**
* @var array list of directories and files which should be excluded from the publishing process.
- * Defaults to exclude '.svn' files only. This option has no effect if {@link linkAssets} is enabled.
+ * 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');
+ public $excludeFiles=array('.svn','.gitignore');
/**
* @var integer the permission to be set for newly generated asset files.
* This value will be used by PHP chmod function.
View
2  framework/web/CThemeManager.php
@@ -81,7 +81,7 @@ public function getThemeNames()
$folder=@opendir($basePath);
while(($file=@readdir($folder))!==false)
{
- if($file!=='.' && $file!=='..' && $file!=='.svn' && is_dir($basePath.DIRECTORY_SEPARATOR.$file))
+ if($file!=='.' && $file!=='..' && $file!=='.svn' && $file!=='.gitignore' && is_dir($basePath.DIRECTORY_SEPARATOR.$file))
$themes[]=$file;
}
closedir($folder);
View
2  requirements/messages/config.php
@@ -10,7 +10,7 @@
'fileTypes'=>array('php'),
'translator'=>'t',
'exclude'=>array(
- '.svn',
+ '.gitignore',
'/messages',
'/views',
),
Please sign in to comment.
Something went wrong with that request. Please try again.