| Index: trunk/phase3/includes/api/ApiMain.php |
| — | — | @@ -811,20 +811,20 @@ |
| 812 | 812 | * Override the parent to generate help messages for all available modules. |
| 813 | 813 | */ |
| 814 | 814 | public function makeHelpMsg() { |
| 815 | | - global $wgMemc, $wgAPICacheHelp, $wgAPICacheHelpTimeout; |
| | 815 | + global $wgMemc, $wgAPICacheHelpTimeout; |
| 816 | 816 | $this->setHelp(); |
| 817 | 817 | // Get help text from cache if present |
| 818 | 818 | $key = wfMemcKey( 'apihelp', $this->getModuleName(), |
| 819 | 819 | SpecialVersion::getVersion( 'nodb' ) . |
| 820 | 820 | $this->getMain()->getShowVersions() ); |
| 821 | | - if ( $wgAPICacheHelp ) { |
| | 821 | + if ( $wgAPICacheHelpTimeout > 0 ) { |
| 822 | 822 | $cached = $wgMemc->get( $key ); |
| 823 | 823 | if ( $cached ) { |
| 824 | 824 | return $cached; |
| 825 | 825 | } |
| 826 | 826 | } |
| 827 | 827 | $retval = $this->reallyMakeHelpMsg(); |
| 828 | | - if ( $wgAPICacheHelp ) { |
| | 828 | + if ( $wgAPICacheHelpTimeout > 0 ) { |
| 829 | 829 | $wgMemc->set( $key, $retval, $wgAPICacheHelpTimeout ); |
| 830 | 830 | } |
| 831 | 831 | return $retval; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -5037,15 +5037,8 @@ |
| 5038 | 5038 | $wgAPIRequestLog = false; |
| 5039 | 5039 | |
| 5040 | 5040 | /** |
| 5041 | | - * Cache the API help text for up to an hour. Disable this during API |
| 5042 | | - * debugging and development |
| | 5041 | + * Set the timeout for the API help text cache. If set to 0, caching disabled |
| 5043 | 5042 | */ |
| 5044 | | -$wgAPICacheHelp = true; |
| 5045 | | - |
| 5046 | | -/** |
| 5047 | | - * Set the timeout for the API help text cache. Ignored if $wgAPICacheHelp |
| 5048 | | - * is false. |
| 5049 | | - */ |
| 5050 | 5043 | $wgAPICacheHelpTimeout = 60*60; |
| 5051 | 5044 | |
| 5052 | 5045 | /** |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -33,6 +33,8 @@ |
| 34 | 34 | Note that this feature should reduce parser cache fragmentation when enabled. |
| 35 | 35 | * $wgMaxUploadSize may now be set to an array to specify the upload size limit |
| 36 | 36 | per upload type. |
| | 37 | +* $wgAPICacheHelp added in 1.16 is now removed. To disable API help caching, set |
| | 38 | + $wgAPICacheHelpTimeout = 0; |
| 37 | 39 | |
| 38 | 40 | === New features in 1.18 === |
| 39 | 41 | * Added a special page, disabled by default, that allows users with the |
| — | — | @@ -93,6 +95,7 @@ |
| 94 | 96 | * (bug 26483) add a iwtitles param to prop=iwlinks |
| 95 | 97 | * (bug 26484) add a lltitles param to prop=langlinks |
| 96 | 98 | * (bug 26480) add a pppageprops param to prop=pageprops |
| | 99 | +* (bug 26650) Remove $wgAPICacheHelp in favour of $wgAPICacheHelpTimeout |
| 97 | 100 | |
| 98 | 101 | === Languages updated in 1.18 === |
| 99 | 102 | |