X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiHelp.php;h=db7c1495750b367942427bfa228ce85e14b9d9af;hb=049e4514d012525e48727fcda2fc38279825cf12;hp=a81ae3f81f9425efe2d433dfa25823b13a88759c;hpb=0e1c80e6e178be646e8deb3fa64fac7e7219938b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index a81ae3f81f..db7c149575 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -45,6 +45,7 @@ class ApiHelp extends ApiBase {
 		$context->setLanguage( $this->getMain()->getLanguage() );
 		$context->setTitle( SpecialPage::getTitleFor( 'ApiHelp' ) );
 		$out = new OutputPage( $context );
+		$out->setCopyrightUrl( 'https://www.mediawiki.org/wiki/Special:MyLanguage/Copyright' );
 		$context->setOutput( $out );
 
 		self::getHelp( $context, $modules, $params );
@@ -90,7 +91,7 @@ class ApiHelp extends ApiBase {
 	 * @return string
 	 */
 	public static function getHelp( IContextSource $context, $modules, array $options ) {
-		global $wgMemc, $wgContLang;
+		global $wgContLang;
 
 		if ( !is_array( $modules ) ) {
 			$modules = array( $modules );
@@ -103,6 +104,7 @@ class ApiHelp extends ApiBase {
 		}
 		$out->setPageTitle( $context->msg( 'api-help-title' ) );
 
+		$cache = ObjectCache::getMainWANInstance();
 		$cacheKey = null;
 		if ( count( $modules ) == 1 && $modules[0] instanceof ApiMain &&
 			$options['recursivesubmodules'] && $context->getLanguage() === $wgContLang
@@ -113,7 +115,7 @@ class ApiHelp extends ApiBase {
 				$cacheKey = wfMemcKey( 'apihelp', $modules[0]->getModulePath(),
 					(int)!empty( $options['toc'] ),
 					str_replace( ' ', '_', SpecialVersion::getVersion( 'nodb' ) ) );
-				$cached = $wgMemc->get( $cacheKey );
+				$cached = $cache->get( $cacheKey );
 				if ( $cached ) {
 					$out->addHTML( $cached );
 					return;
@@ -150,7 +152,7 @@ class ApiHelp extends ApiBase {
 		$out->addHTML( $html );
 
 		if ( $cacheKey !== null ) {
-			$wgMemc->set( $cacheKey, $out->getHTML(), $cacheHelpTimeout );
+			$cache->set( $cacheKey, $out->getHTML(), $cacheHelpTimeout );
 		}
 	}
 
@@ -702,7 +704,12 @@ class ApiHelp extends ApiBase {
 						$submodules[] = $manager->getModule( $name );
 					}
 				}
-				$help['submodules'] .= self::getHelpInternal( $context, $submodules, $suboptions, $haveModules );
+				$help['submodules'] .= self::getHelpInternal(
+					$context,
+					$submodules,
+					$suboptions,
+					$haveModules
+				);
 				$numSubmodules = count( $submodules );
 			}
 
@@ -752,6 +759,8 @@ class ApiHelp extends ApiBase {
 		return array(
 			'action=help'
 				=> 'apihelp-help-example-main',
+			'action=help&modules=query&submodules=1'
+				=> 'apihelp-help-example-submodules',
 			'action=help&recursivesubmodules=1'
 				=> 'apihelp-help-example-recursive',
 			'action=help&modules=help'