X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=maintenance%2FgenerateSitemap.php;h=1930a22a13ce963bf5627ca88557f10ffc5dc704;hb=25505f7839cf91dd8c7f3cc6f98f8f7de78e3abe;hp=b5681c186af3d2712c5d6ae8b80419fc73c15ce3;hpb=cce9485e5f22d513ae9e719d1d974a35ec169fe4;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php index b5681c186a..1930a22a13 100644 --- a/maintenance/generateSitemap.php +++ b/maintenance/generateSitemap.php @@ -244,9 +244,6 @@ class GenerateSitemap extends Maintenance { * @return null|string */ private static function init_path( $fspath ) { - if ( !isset( $fspath ) ) { - return null; - } # Create directory if needed if ( $fspath && !is_dir( $fspath ) ) { wfMkdirParents( $fspath, null, __METHOD__ ) or die( "Can not create directory $fspath.\n" ); @@ -263,6 +260,7 @@ class GenerateSitemap extends Maintenance { global $wgSitemapNamespaces; if ( is_array( $wgSitemapNamespaces ) ) { $this->namespaces = $wgSitemapNamespaces; + return; } @@ -343,7 +341,7 @@ class GenerateSitemap extends Maintenance { $fns = $wgContLang->getFormattedNsText( $namespace ); $this->output( "$namespace ($fns)\n" ); - $skippedRedirects = 0; // Number of redirects skipped for that namespace + $skippedRedirects = 0; // Number of redirects skipped for that namespace foreach ( $res as $row ) { if ( $this->skipRedirects && $row->page_is_redirect ) { $skippedRedirects++; @@ -415,6 +413,7 @@ class GenerateSitemap extends Maintenance { throw new MWException( __METHOD__ . " error opening file $file with flags $flags. Check permissions?" ); } + return $resource; } @@ -457,6 +456,7 @@ class GenerateSitemap extends Maintenance { */ function sitemapFilename( $namespace, $count ) { $ext = $this->compress ? '.gz' : ''; + return "sitemap-{$this->identifier}-NS_$namespace-$count.xml$ext"; }