diff --git a/module/bug/model.php b/module/bug/model.php index dad2de58be..ffacd7ed8a 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3302,7 +3302,7 @@ class bugModel extends model foreach($browserList as $value) { if(empty($value)) continue; - $browser .= $this->lang->bug->browserList[$value] . ','; + $browser .= zget($this->lang->bug->browserList, $value) . ','; } $os = trim($os, ','); $browser = trim($browser, ','); diff --git a/module/extension/model.php b/module/extension/model.php index b34b2f9b27..fa10ae4fa2 100644 --- a/module/extension/model.php +++ b/module/extension/model.php @@ -630,9 +630,17 @@ class extensionModel extends model public function cleanModelCache() { $modelCacheFiles = glob($this->app->getTmpRoot() . 'model/*'); + $zfile = $this->app->loadClass('zfile'); foreach($modelCacheFiles as $cacheFile) { - if(is_writable($cacheFile) and !is_dir($cacheFile)) @unlink($cacheFile); + if(is_dir($cacheFile)) + { + $zfile->removeDir($cacheFile); + } + elseif(is_writable($cacheFile) and !is_dir($cacheFile)) + { + @unlink($cacheFile); + } } }