Merge remote-tracking branch 'refs/remotes/origin/master'

erikuus · May 13, 2013 · 1fc423c · 1fc423c
2 parents 395c11a + 818ba2d
commit 1fc423c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/protected/extensions/actions/XHEditorUpload.php b/protected/extensions/actions/XHEditorUpload.php
@@ -56,7 +56,7 @@ class XHEditorUpload extends CAction
 	/**
 	 * @var upload extension
 	 */
-	public $upExt='txt,rar,zip,jpg,jpeg,gif,png,swf,wmv,avi,wma,mp3,mid';
+	public $upExt='pdf,txt,rar,zip,jpg,jpeg,gif,png,swf,wmv,avi,wma,mp3,mid';
 	/**
 	 * @var return format after upload: 1- only the url, 2- parameter array
 	 */

diff --git a/protected/views/site/extensions/wysiwyg.php b/protected/views/site/extensions/wysiwyg.php
@@ -18,6 +18,8 @@
 		'width'=>'740px',
 		'height'=>'400px',
 		'loadCSS'=>XHtml::cssUrl('editor.css'),
+		'upLinkUrl'=>$this->createUrl('request/uploadFile'),
+		'upLinkExt'=>'zip,rar,txt,pdf',
 		'upImgUrl'=>$this->createUrl('request/uploadFile'),
 		'upImgExt'=>'jpg,jpeg,gif,png',
 	),
@@ -38,6 +40,8 @@
 		'width'=>'740px',
 		'height'=>'400px',
 		'loadCSS'=>XHtml::cssUrl('editor.css'),
+		'upLinkUrl'=>$this->createUrl('request/uploadFile'),// <?php echo Yii::t('ui','NB! Access restricted by IP');?>
+		'upLinkExt'=>'zip,rar,txt,pdf',
 		'upImgUrl'=>$this->createUrl('request/uploadFile'), // <?php echo Yii::t('ui','NB! Access restricted by IP');?>
 		'upImgExt'=>'jpg,jpeg,gif,png',
 	),