Skip to content

Commit

Permalink
Merge branch '4.8'
Browse files Browse the repository at this point in the history
# Conflicts:
#	calendar-bundle/src/Resources/contao/classes/Events.php
#	calendar-bundle/src/Resources/contao/dca/tl_calendar_events.php
#	calendar-bundle/src/Resources/contao/modules/ModuleCalendar.php
#	calendar-bundle/src/Resources/contao/modules/ModuleEventReader.php
#	comments-bundle/src/Resources/contao/dca/tl_content.php
#	comments-bundle/src/Resources/contao/dca/tl_module.php
#	composer.json
#	core-bundle/src/Resources/contao/classes/Backend.php
#	core-bundle/src/Resources/contao/classes/Versions.php
#	core-bundle/src/Resources/contao/dca/tl_content.php
#	core-bundle/src/Resources/contao/dca/tl_files.php
#	core-bundle/src/Resources/contao/dca/tl_image_size.php
#	core-bundle/src/Resources/contao/dca/tl_member.php
#	core-bundle/src/Resources/contao/dca/tl_opt_in.php
#	core-bundle/src/Resources/contao/dca/tl_page.php
#	core-bundle/src/Resources/contao/dca/tl_undo.php
#	core-bundle/src/Resources/contao/drivers/DC_Folder.php
#	core-bundle/src/Resources/contao/drivers/DC_Table.php
#	core-bundle/src/Resources/contao/forms/FormCaptcha.php
#	core-bundle/src/Resources/contao/helper/functions.php
#	core-bundle/src/Resources/contao/library/Contao/Automator.php
#	core-bundle/src/Resources/contao/library/Contao/Database/Installer.php
#	core-bundle/src/Resources/contao/library/Contao/Database/Updater.php
#	core-bundle/src/Resources/contao/library/Contao/Input.php
#	core-bundle/src/Resources/contao/pages/PageRegular.php
#	core-bundle/src/Resources/contao/widgets/FileTree.php
#	core-bundle/src/Resources/contao/widgets/PageTree.php
#	monorepo.yml
  • Loading branch information
leofeyer committed Oct 1, 2019
2 parents e05aeda + 3c42b21 commit 6ad4d16
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Resources/contao/classes/Newsletter.php
Expand Up @@ -1015,7 +1015,7 @@ public function getSearchablePages($arrPages, $intRoot=0, $blnIsSitemap=false)
}

// The target page is exempt from the sitemap (see #6418)
if ($objParent->sitemap == 'map_never')
if ($objParent->robots == 'noindex,nofollow')
{
continue;
}
Expand Down

0 comments on commit 6ad4d16

Please sign in to comment.