* Fix bug #34473.
This commit is contained in:
@@ -171,18 +171,18 @@ class productModel extends model
|
||||
if(defined('TUTORIAL')) return $productID;
|
||||
|
||||
if($productID == 0 and $this->cookie->preProductID and isset($products[$this->cookie->preProductID])) $productID = $this->cookie->preProductID;
|
||||
if($productID == 0 and $this->session->product == '') $productID = key($products);
|
||||
if($productID == 0 and $this->session->product == '') $productID = (int)key($products);
|
||||
$this->session->set('product', (int)$productID, $this->app->tab);
|
||||
|
||||
if(!isset($products[$this->session->product]))
|
||||
{
|
||||
$product = $this->getById($productID);
|
||||
|
||||
if(empty($product) or $product->deleted == 1) $productID = key($products);
|
||||
if(empty($product) or $product->deleted == 1) $productID = (int)key($products);
|
||||
$this->session->set('product', (int)$productID, $this->app->tab);
|
||||
if($productID && strpos(",{$this->app->user->view->products},", ",{$productID},") === false)
|
||||
{
|
||||
$productID = key($products);
|
||||
$productID = (int)key($products);
|
||||
$this->session->set('product', (int)$productID, $this->app->tab);
|
||||
$this->accessDenied($this->lang->product->accessDenied);
|
||||
}
|
||||
|
||||
@@ -113,8 +113,8 @@ class projectModel extends model
|
||||
if(defined('TUTORIAL')) return $projectID;
|
||||
|
||||
if($projectID == 0 and $this->cookie->lastProject) $projectID = $this->cookie->lastProject;
|
||||
if($projectID == 0 and (int)$this->session->project == 0) $projectID = key($projects);
|
||||
if($projectID == 0) $projectID = key($projects);
|
||||
if($projectID == 0 and (int)$this->session->project == 0) $projectID = (int)key($projects);
|
||||
if($projectID == 0) $projectID = (int)key($projects);
|
||||
|
||||
$this->session->set('project', (int)$projectID, $this->app->tab);
|
||||
|
||||
@@ -130,12 +130,12 @@ class projectModel extends model
|
||||
return $this->session->project;
|
||||
}
|
||||
|
||||
$this->session->set('project', key($projects), $this->app->tab);
|
||||
$this->session->set('project', (int)key($projects), $this->app->tab);
|
||||
$this->accessDenied();
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->session->set('project', key($projects), $this->app->tab);
|
||||
$this->session->set('project', (int)key($projects), $this->app->tab);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user