From 0cf2636f79d347fc50dda3568bfd9c531f9b469c Mon Sep 17 00:00:00 2001 From: Ilmari Karonen Date: Thu, 2 Dec 2010 22:40:54 +0000 Subject: [PATCH] followup to r77176: code style, release notes --- RELEASE-NOTES | 2 ++ maintenance/generateSitemap.php | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 822f5214b4..93fe493ecf 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -543,6 +543,8 @@ LocalSettings.php. The specific bugs are listed below in the general notes. * (bug 26125) prop=imageinfo&iiprop=size now returns the page count if the file is a multi-page file * (bug 10268) Added linktodiffs parameter on action=feedwatchlist +* (bug 9675) generateSitemap.php now takes an --urlpath parameter to allow + absolute URLs in the sitemap index (as required e.g. by Google) === Languages updated in 1.17 === diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php index ae6f7220ad..30d6f73cab 100644 --- a/maintenance/generateSitemap.php +++ b/maintenance/generateSitemap.php @@ -140,7 +140,9 @@ class GenerateSitemap extends Maintenance { $this->size_limit = pow( 2, 20 ) * 10; $this->fspath = self::init_path( $this->getOption( 'fspath', getcwd() ) ); $this->urlpath = $this->getOption( 'urlpath', "" ); - if ( $this->urlpath !== "" && substr( $this->urlpath, -1 ) !== '/' ) $this->urlpath .= '/'; + if ( $this->urlpath !== "" && substr( $this->urlpath, -1 ) !== '/' ) { + $this->urlpath .= '/'; + } $this->compress = $this->getOption( 'compress', 'yes' ) !== 'no'; $this->dbr = wfGetDB( DB_SLAVE ); $this->generateNamespaces(); -- 2.20.1