| Index: branches/wmf/1.16wmf4/includes/api/ApiMain.php |
| — | — | @@ -160,6 +160,11 @@ |
| 161 | 161 | global $wgAPIModules; // extension modules |
| 162 | 162 | $this->mModules = $wgAPIModules + self :: $Modules; |
| 163 | 163 | |
| | 164 | + global $wgAPIDisabledActions; |
| | 165 | + foreach ( $wgAPIDisabledActions as $action ) { |
| | 166 | + unset( $this->mModules[$action] ); |
| | 167 | + } |
| | 168 | + |
| 164 | 169 | $this->mModuleNames = array_keys( $this->mModules ); |
| 165 | 170 | $this->mFormats = self :: $Formats; |
| 166 | 171 | $this->mFormatNames = array_keys( $this->mFormats ); |
| Property changes on: branches/wmf/1.16wmf4/includes/api/ApiMain.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 167 | 172 | Merged /branches/REL1_15/phase3/includes/api/ApiMain.php:r51646 |
| 168 | 173 | Merged /branches/REL1_16/phase3/includes/api/ApiMain.php:r69932 |
| 169 | 174 | Merged /branches/sqlite/includes/api/ApiMain.php:r58211-58321 |
| 170 | 175 | Merged /trunk/phase3/includes/api/ApiMain.php:r63549,63764,63897-63901,64454,66486,69339,69347,69350,69369,69379,69776,69931,70078,71059,71098,73510 |
| 171 | 176 | Merged /branches/wmf-deployment/includes/api/ApiMain.php:r53381,59952,60970 |
| Index: branches/wmf/1.16wmf4/includes/DefaultSettings.php |
| — | — | @@ -3926,6 +3926,13 @@ |
| 3927 | 3927 | $wgAPIListModules = array(); |
| 3928 | 3928 | |
| 3929 | 3929 | /** |
| | 3930 | + * Disabled API actions. To disable an API action, add its name here, for |
| | 3931 | + * example: |
| | 3932 | + * $wgAPIDisabledActions[] = 'parse'; |
| | 3933 | + */ |
| | 3934 | +$wgAPIDisabledActions = array(); |
| | 3935 | + |
| | 3936 | +/** |
| 3930 | 3937 | * Maximum amount of rows to scan in a DB query in the API |
| 3931 | 3938 | * The default value is generally fine |
| 3932 | 3939 | */ |
| Property changes on: branches/wmf/1.16wmf4/includes/DefaultSettings.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3933 | 3940 | Merged /trunk/phase3/includes/DefaultSettings.php:r73510 |