* Fix bug #29749.
This commit is contained in:
@@ -56,16 +56,16 @@ class transferModel extends model
|
||||
}
|
||||
|
||||
/**
|
||||
* Check tmpFile.
|
||||
* Check tmp file.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function checkTmpFile()
|
||||
{
|
||||
$file = $this->session->fileImportFileName;
|
||||
$tmpPath = $this->loadModel('file')->getPathOfImportedFile();
|
||||
$tmpFile = $tmpPath . DS . md5(basename($file));
|
||||
$file = $this->session->fileImportFileName;
|
||||
$tmpPath = $this->loadModel('file')->getPathOfImportedFile();
|
||||
$tmpFile = $tmpPath . DS . md5(basename($file));
|
||||
|
||||
if($this->maxImport and file_exists($tmpFile)) return $tmpFile;
|
||||
return false;
|
||||
@@ -196,7 +196,7 @@ class transferModel extends model
|
||||
$rows = $this->getRows($model, $fieldList);
|
||||
if($model == 'story')
|
||||
{
|
||||
$product = $this->loadModel('product')->getByID((int)$this->session->storyPortParams['productID']);
|
||||
$product = $this->loadModel('product')->getByID((int)$this->session->storyTransferParams['productID']);
|
||||
if($product and $product->shadow)
|
||||
{
|
||||
foreach($rows as $id => $row)
|
||||
|
||||
Reference in New Issue
Block a user