Skip to content

Commit

Permalink
Merge pull request #1 from jfyoboue/develop
Browse files Browse the repository at this point in the history
Merging for version 1.0.1
  • Loading branch information
jfyoboue committed Feb 23, 2017
2 parents fe79259 + 9692cd8 commit dcde926
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ RewriteEngine on

RewriteCond %{HTTP_ACCEPT} text/html|application/json|application/xml|text/xml

#RewriteRule ^(.*)$ web/app.php?url=$1 [QSA,L]
RewriteRule ^(.*)$ web/app.php?url=$1 [QSA,L]
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ Browse to http://localhost:8008
* plugins
Contains plugins used in project e.g (bootstrap, jquery, etc.)

## Change log

* 1.0.1
- Bug fixed in .htaccess

## Credits

Expand Down
6 changes: 6 additions & 0 deletions app/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ class Controller extends \Bandama\Foundation\Controller\Controller {
*/
protected $router;

/**
* @var \Bandama\Foundation\Session\Session
*/
protected $session;

/**
* @var \Monolog\Logger Logging component
*/
Expand All @@ -35,6 +40,7 @@ public function __construct() {
$this->app = \App\App::getInstance();
$this->config = $this->app->get('config');
$this->router = $this->app->get('router');
$this->session = $this->app->get('session');
$this->logger = $this->app->get('logger');
$this->viewPath = __DIR__.'/..'.$this->config->get('view_path');
}
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dcde926

Please sign in to comment.