Skip to content

[5.0] Switching Joomla\CMS\Filter\OutputFilter to Joomla\Filter\OutputFilter #40429

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
HLeithner merged 7 commits into from
Jul 2, 2023
Merged

[5.0] Switching Joomla\CMS\Filter\OutputFilter to Joomla\Filter\OutputFilter #40429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3a63af8
Switching Joomla\CMS\Filter\OutputFilter to Joomla\Filter\OutputFilter
Hackwar Apr 19, 2023
8965642
Reverting language dependency addition
Hackwar Apr 20, 2023
ee0da3c
Updating joomla/filter package
Hackwar May 30, 2023
438b58f
Merge branch '5.0-dev' of https://github.com/joomla/joomla-cms into 5…
Hackwar May 30, 2023
a68294d
Merge branch '5.0-dev' into 5.0-filter-outputfilter
Hackwar Jun 8, 2023
eb0ec68
Merge branch '5.0-dev' into 5.0-filter-outputfilter
Hackwar Jul 1, 2023
087a2fc
Moving setting language in OutputFilter to loadLanguage in WebApplica…
Hackwar Jul 2, 2023
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
2 changes: 1 addition & 1 deletion administrator/components/com_config/src/Model/ApplicationModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Filesystem\Folder;
use Joomla\CMS\Filesystem\Path;
use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\Http\HttpFactory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Log\Log;
Expand All @@ -34,6 +33,7 @@
use Joomla\Database\DatabaseDriver;
use Joomla\Database\ParameterType;
use Joomla\Filesystem\File;
use Joomla\Filter\OutputFilter;
use Joomla\Registry\Registry;
use Joomla\Utilities\ArrayHelper;
use PHPMailer\PHPMailer\Exception as phpMailerException;
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/src/Model/ArticleModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use Joomla\CMS\Event\AbstractEvent;
use Joomla\CMS\Factory;
use Joomla\CMS\Filter\InputFilter;
use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\Form\Form;
use Joomla\CMS\Form\FormFactoryInterface;
use Joomla\CMS\Helper\TagsHelper;
Expand All @@ -35,6 +34,7 @@
use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
use Joomla\Database\ParameterType;
use Joomla\Filter\OutputFilter;
use Joomla\Registry\Registry;
use Joomla\Utilities\ArrayHelper;

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
namespace Joomla\Component\Cpanel\Administrator\View\Cpanel;

use Joomla\CMS\Factory;
use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\Helper\ModuleHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;
use Joomla\Filter\OutputFilter;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_finder/src/Service/HTML/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
namespace Joomla\Component\Finder\Administrator\Service\HTML;

use Joomla\CMS\Factory;
use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Multilanguage;
use Joomla\CMS\Language\Text;
use Joomla\Component\Finder\Administrator\Helper\LanguageHelper;
use Joomla\Component\Finder\Administrator\Indexer\Query;
use Joomla\Database\DatabaseAwareTrait;
use Joomla\Filter\OutputFilter;
use Joomla\Registry\Registry;

// phpcs:disable PSR1.Files.SideEffects
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_feed/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

defined('_JEXEC') or die;

use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\Filter\OutputFilter;

// Check if feed URL has been set
if (empty($rssurl)) {
Expand Down
2 changes: 1 addition & 1 deletion components/com_newsfeeds/tmpl/newsfeed/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

defined('_JEXEC') or die;

use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\FileLayout;
use Joomla\CMS\Layout\LayoutHelper;
use Joomla\Filter\OutputFilter;

?>

Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/links/groupopen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\Language\Text;
use Joomla\Filter\OutputFilter;

?>
<h2 class="nav-header"><?php echo OutputFilter::ampReplace(Text::_($displayData)); ?></h2>
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/links/link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

defined('_JEXEC') or die;

use Joomla\CMS\Filter\OutputFilter;
use Joomla\Filter\OutputFilter;

$id = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
$target = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Application/ApplicationHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Factory;
use Joomla\CMS\Filter\OutputFilter;
use Joomla\Filter\OutputFilter;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
Expand Down
2 changes: 2 additions & 0 deletions libraries/src/Application/WebApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use Joomla\CMS\Uri\Uri;
use Joomla\CMS\User\User;
use Joomla\CMS\Version;
use Joomla\Filter\OutputFilter;
use Joomla\Registry\Registry;
use Joomla\Session\SessionEvent;
use Psr\Http\Message\ResponseInterface;
Expand Down Expand Up @@ -296,6 +297,7 @@ public function loadDocument(Document $document = null)
public function loadLanguage(Language $language = null)
{
$this->language = $language ?? Factory::getLanguage();
OutputFilter::setLanguage($language);

return $this;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_feed/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

defined('_JEXEC') or die;

use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\Filter\OutputFilter;

// Check if feed URL has been set
if (empty($rssurl)) {
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_menu/tmpl/default_component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\Filter\OutputFilter;

$attributes = [];

Expand Down
2 changes: 1 addition & 1 deletion modules/mod_menu/tmpl/default_url.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\Filter\OutputFilter;

$attributes = [];

Expand Down
2 changes: 1 addition & 1 deletion templates/cassiopeia/html/mod_menu/dropdown-metismenu_component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\Filter\OutputFilter;

$attributes = [];

Expand Down
2 changes: 1 addition & 1 deletion templates/cassiopeia/html/mod_menu/dropdown-metismenu_url.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\Filter\OutputFilter;

$attributes = [];

Expand Down