Project

General

Profile

2920.patch

krileon, 20 October 2011 03:59 PM

View differences:

administrator/components/com_comprofiler/imgToolbox.class.php
107 107
					$this->_IM_path		=	$this->autodetectExec( 'convert' );
108 108
				}else{
109 109
					if($this->_IM_path){
110
						if(!is_dir($this->_IM_path)){
110
						if(function_exists( 'is_executable' )&&(!@is_executable( $this->_IM_path . 'convert' ))){
111 111
								$error=1;
112 112
								$errorMSG = CBTxt::T('Error: your ImageMagick path is not correct! Please (re)specify it in the Admin-system under "Settings"');
113
							} elseif (!function_exists( 'is_executable' )) {
114
								$error=1;
115
								$errorMSG = CBTxt::T("Error: Unable to execute is_executable function");
113 116
							}
114 117
					}
115 118
				}
......
120 123
					$this->_NETPBM_path	=	$this->autodetectExec( 'jpegtopnm' );
121 124
				}else{
122 125
					if($this->_NETPBM_path){
123
						if(!is_dir($this->_NETPBM_path)){
126
						if(function_exists( 'is_executable' )&&(!@is_executable( $this->_NETPBM_path . 'jpegtopnm' ))){
124 127
								$error=1;
125 128
								$errorMSG = CBTxt::T('Error: your NetPBM path is not correct! Please (re)specify it in the Admin-system under "Settings"');
129
							} elseif (!function_exists( 'is_executable' )) {
130
								$error=1;
131
								$errorMSG = CBTxt::T("Error: Unable to execute is_executable function");
126 132
							}
127 133
					}
128 134
				}