tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-27 23:19:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1907 from silverstripe/pulls/4.0/content-controller-project

Browse Source 
BUGFIX: ContentController still using global $project;
This commit is contained in:
Damian Mooyman 2017-07-24 10:43:15 +12:00 committed by GitHub
commit bed501c0fe
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');
}
/**