From: Platonides <platonides@gmail.com>
Date: Thu, 6 Dec 2012 22:29:44 +0000 (+0100)
Subject: Also pass $doxygenInputFilter as parameter instead of global.
X-Git-Tag: 1.31.0-rc.0~21398^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=12fafe194470ed92d04ea5ee89f23e05876bedce;p=lhc%2Fweb%2Fwiklou.git

Also pass $doxygenInputFilter as parameter instead of global.

Change-Id: I63fa0125576c4694f63d271f9824d783869f25d1
---

diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php
index e36674e400..6e01291eb7 100644
--- a/maintenance/mwdocgen.php
+++ b/maintenance/mwdocgen.php
@@ -114,8 +114,7 @@ function readaline( $prompt = '' ) {
  * @param $doxyGenerateMan Boolean
  * @return string
  */
-function generateConfigFile( $doxygenTemplate, $outputDirectory, $stripFromPath, $currentVersion, $input, $exclude, $excludePatterns, $doxyGenerateMan ) {
-	global $doxygenInputFilter;
+function generateConfigFile( $doxygenTemplate, $outputDirectory, $stripFromPath, $currentVersion, $input, $exclude, $excludePatterns, $doxyGenerateMan, $doxygenInputFilter ) {
 
 	$template = file_get_contents( $doxygenTemplate );
 	// Replace template placeholders by correct values.
@@ -242,7 +241,7 @@ $version = 'master';
 $excludedPaths = $mwPath . join( " $mwPath", $mwExcludePaths );
 print "EXCLUDE: $excludedPaths\n\n";
 
-$generatedConf = generateConfigFile( $doxygenTemplate, $doxyOutput, $mwPath, $version, $input, $excludedPaths, $excludePatterns, $doxyGenerateMan );
+$generatedConf = generateConfigFile( $doxygenTemplate, $doxyOutput, $mwPath, $version, $input, $excludedPaths, $excludePatterns, $doxyGenerateMan, $doxygenInputFilter );
 $command = $doxygenBin . ' ' . $generatedConf;
 
 echo <<<TEXT