Commit cfc0ba9962b1b01a247a718df78a21448ccb6edf
1 parent
4b85344a
KTS-2859
"Unable to upload files in Windows XP and Windows 2003 - seemingly an MS Word issue only." Updated. Fixed automerge error. Committed by: Kevin Fourie Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.4.6-Release-Branch@7933 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
1 additions
and
9 deletions
lib/util/ktutil.inc
| @@ -209,15 +209,7 @@ class KTUtil { | @@ -209,15 +209,7 @@ class KTUtil { | ||
| 209 | if(OS_WINDOWS){ | 209 | if(OS_WINDOWS){ |
| 210 | $sCmd = 'call '.$sCmd; | 210 | $sCmd = 'call '.$sCmd; |
| 211 | } | 211 | } |
| 212 | - | ||
| 213 | - $WshShell = new COM("WScript.Shell"); | ||
| 214 | - $res = $WshShell->Run($sCmd, 0, $wait); | ||
| 215 | - | ||
| 216 | - $iRet = 0; | ||
| 217 | - $aOutput = array($res); | ||
| 218 | - }else{ | ||
| 219 | - exec($sCmd, $aOutput, $iRet); | ||
| 220 | - } | 212 | + exec($sCmd, $aOutput, $iRet); |
| 221 | 213 | ||
| 222 | $aRet['ret'] = $iRet; | 214 | $aRet['ret'] = $iRet; |
| 223 | $aRet['out'] = $aOutput; | 215 | $aRet['out'] = $aOutput; |