Skip to content
This repository has been archived by the owner on Oct 18, 2023. It is now read-only.

Commit

Permalink
fix on #34 template export to zip with sql
Browse files Browse the repository at this point in the history
  • Loading branch information
peter-mw committed Dec 12, 2014
1 parent 33a6e73 commit bcf20ad
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 80 deletions.
6 changes: 4 additions & 2 deletions src/Microweber/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ public static function getInstance($params = null)
return self::$instance;
}

public function make($class)
public function make($property)
{
return app()->make($class);

return app()->make($property);
}

public function __get($property)
{

return $this->make($property);
}
}
4 changes: 3 additions & 1 deletion src/Microweber/Utils/Adapters/Cache/LaravelCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function __construct($app)

$driver = $this->app['config']['cache.driver'];

if ($driver == 'file' or $driver == 'database') {
if ($driver == 'database') {
$this->support_tags = false;
} else {
$this->support_tags = true;
Expand Down Expand Up @@ -92,7 +92,9 @@ public function cache_group($cache_group)
public function save($data_to_cache, $cache_id, $cache_group = 'global')
{


if (!$this->support_tags) {

return;
return Cache::put($cache_group . $cache_id, $data_to_cache, $this->ttl);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Microweber/functions/common.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function mw($class = null)
{

$app = \Microweber\Application::getInstance();

$class = str_replace('/','\\',$class);
if ($class == null or $class == false or strtolower($class) == 'application') {
return $app;
} else {
Expand Down
Loading

0 comments on commit bcf20ad

Please sign in to comment.