tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX: ContentController still using global $project;

This commit is contained in:
Aaron Carlino 2017-07-21 09:56:41 +12:00 committed by GitHub
parent e38a0c49dd
commit cc6b44223e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/Controllers/ContentController.php
View File

@ -10,6 +10,7 @@ use SilverStripe\Control\HTTPResponse;
use SilverStripe\Control\HTTPResponse_Exception;
use SilverStripe\Core\Convert;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Manifest\ModuleManifest;
use SilverStripe\i18n\i18n;
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataObject;
@ -247,8 +248,7 @@ class ContentController extends Controller
*/
public function project()
{
global $project;
return $project;
return ModuleManifest::config()->get('project');
}
/**