Merge branch '4.0-dev' into feature/todos

joomla · Dec 7, 2018 · 436a132 · 436a132
2 parents dedea31 + 05cc576
commit 436a132
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/libraries/src/Document/FeedDocument.php b/libraries/src/Document/FeedDocument.php
@@ -12,7 +12,7 @@
 
 use Joomla\CMS\Document\Feed\FeedImage;
 use Joomla\CMS\Document\Feed\FeedItem;
-use Joomla\CMS\Factory;
+use Joomla\CMS\Factory as CmsFactory;
 use Joomla\CMS\Language\Text;
 
 /**
@@ -181,8 +181,8 @@ public function __construct($options = array())
 		$this->_type = 'feed';
 
 		// Gets and sets timezone offset from site configuration
-		$this->lastBuildDate = Factory::getDate();
-		$this->lastBuildDate->setTimeZone(new \DateTimeZone(Factory::getApplication()->get('offset', 'UTC')));
+		$this->lastBuildDate = CmsFactory::getDate();
+		$this->lastBuildDate->setTimeZone(new \DateTimeZone(CmsFactory::getApplication()->get('offset', 'UTC')));
 	}
 
 	/**
@@ -200,7 +200,7 @@ public function __construct($options = array())
 	public function render($cache = false, $params = array())
 	{
 		// Get the feed type
-		$type = Factory::getApplication()->input->get('type', 'rss');
+		$type = CmsFactory::getApplication()->input->get('type', 'rss');
 
 		// Instantiate feed renderer and set the mime encoding
 		$renderer = $this->loadRenderer(($type) ? $type : 'rss');

diff --git a/libraries/src/Document/JsonDocument.php b/libraries/src/Document/JsonDocument.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Factory;
+use Joomla\CMS\Factory as CmsFactory;
 
 /**
  * JsonDocument class, provides an easy interface to parse and display JSON output
@@ -68,7 +68,7 @@ public function __construct($options = array())
 	 */
 	public function render($cache = false, $params = array())
 	{
-		$app = Factory::getApplication();
+		$app = CmsFactory::getApplication();
 
 		$app->allowCache(false);
 

diff --git a/libraries/src/Document/XmlDocument.php b/libraries/src/Document/XmlDocument.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Factory;
+use Joomla\CMS\Factory as CmsFactory;
 
 /**
  * XmlDocument class, provides an easy interface to parse and display XML output
@@ -59,7 +59,7 @@ public function render($cache = false, $params = array())
 	{
 		parent::render();
 
-		Factory::getApplication()->setHeader('Content-disposition', 'inline; filename="' . $this->getName() . '.xml"', true);
+		CmsFactory::getApplication()->setHeader('Content-disposition', 'inline; filename="' . $this->getName() . '.xml"', true);
 
 		return $this->getBuffer();
 	}