Skip to content

[4.0] It was a diffenent factory #21587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 13, 2018
Merged

[4.0] It was a diffenent factory #21587

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50fa279
I was a diffenent factory
rdeutz Aug 13, 2018
662f892
lowercase keyword
wilsonge Aug 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libraries/src/Document/Document.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

use Joomla\Application\AbstractWebApplication;
use Joomla\CMS\Date\Date;
use Joomla\CMS\Factory;
use Joomla\CMS\Factory AS CmsFactory;
Copy link
Contributor

@Quy Quy Aug 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lowercase AS

use Joomla\CMS\Log\Log;
use Symfony\Component\WebLink\HttpHeaderSerializer;

Expand Down Expand Up @@ -332,7 +332,7 @@ public static function getInstance($type = 'html', $attributes = array())

if (empty(self::$instances[$signature]))
{
self::$instances[$signature] = Factory::getContainer()->get(FactoryInterface::class)->createDocument($type, $attributes);
self::$instances[$signature] = CmsFactory::getContainer()->get(FactoryInterface::class)->createDocument($type, $attributes);
}

return self::$instances[$signature];
Expand Down Expand Up @@ -1283,7 +1283,7 @@ public function parse($params = array())
*/
public function render($cache = false, $params = array())
{
$app = Factory::getApplication();
$app = CmsFactory::getApplication();

if ($mdate = $this->getModifiedDate())
{
Expand Down Expand Up @@ -1369,7 +1369,7 @@ protected function preloadAssets()
// Check if the manager's provider has links, if so add the Link header
if ($links = $this->getPreloadManager()->getLinkProvider()->getLinks())
{
Factory::getApplication()->setHeader('Link', (new HttpHeaderSerializer)->serialize($links));
CmsFactory::getApplication()->setHeader('Link', (new HttpHeaderSerializer)->serialize($links));
}
}
}