View | Details | Raw Unified | Return to bug 7233 | Differences between
and this patch

Collapse All | Expand All

(-)a/lib/pkp/lib/tinymce/jscripts/tiny_mce/plugins/jbimages/ci/application/controllers/editor.php (-3 / +3 lines)
 Lines 47-57   public function __construct() Link Here 
47
	private function _lang_set($lang)
47
	private function _lang_set($lang)
48
	{
48
	{
49
		// We do say hello to any language set as lang_id in **_dlg.js
49
		// We do say hello to any language set as lang_id in **_dlg.js
50
		/*$langs = array('russian','english');
50
		$langs = array('russian','english');
51
		if (!in_array($lang, $langs))
51
		if (!in_array($lang, $langs))
52
		{
52
		{
53
			$lang = 'english';
53
			$lang = 'english';
54
		}*/
54
		}
55
55
56
		$this->config->set_item('language', $lang);
56
		$this->config->set_item('language', $lang);
57
		$this->lang->load('jbstrings', $lang);
57
		$this->lang->load('jbstrings', $lang);
 Lines 91-96   public function upload($lang='english') Link Here 
91
91
92
		// Check that the image directory isn't full
92
		// Check that the image directory isn't full
93
		$maxUploadDirSize = $this->config->item('max_upload_dir_size', 'uploader_settings') * 1024;
93
		$maxUploadDirSize = $this->config->item('max_upload_dir_size', 'uploader_settings') * 1024;
94
		$uploadDirSizeExceeded = false;
94
		if ($maxUploadDirSize != 0) {
95
		if ($maxUploadDirSize != 0) {
95
			$this->load->helper('file');
96
			$this->load->helper('file');
96
97
 Lines 104-110   public function upload($lang='english') Link Here 
104
			// Add the size of the newly uploaded file
105
			// Add the size of the newly uploaded file
105
			$totalSize += $_FILES['userfile']['size'];
106
			$totalSize += $_FILES['userfile']['size'];
106
107
107
			$uploadDirSizeExceeded = false;
108
			if($totalSize > $maxUploadDirSize)
108
			if($totalSize > $maxUploadDirSize)
109
			{
109
			{
110
				$uploadDirSizeExceeded = true;
110
				$uploadDirSizeExceeded = true;

Return to bug 7233