| Index: trunk/phase3/includes/Defines.php |
| — | — | @@ -52,8 +52,8 @@ |
| 53 | 53 | define('NS_USER_TALK', 3); |
| 54 | 54 | define('NS_PROJECT', 4); |
| 55 | 55 | define('NS_PROJECT_TALK', 5); |
| 56 | | -define('NS_IMAGE', 6); |
| 57 | | -define('NS_IMAGE_TALK', 7); |
| | 56 | +define('NS_FILE', 6); |
| | 57 | +define('NS_FILE_TALK', 7); |
| 58 | 58 | define('NS_MEDIAWIKI', 8); |
| 59 | 59 | define('NS_MEDIAWIKI_TALK', 9); |
| 60 | 60 | define('NS_TEMPLATE', 10); |
| — | — | @@ -62,6 +62,16 @@ |
| 63 | 63 | define('NS_HELP_TALK', 13); |
| 64 | 64 | define('NS_CATEGORY', 14); |
| 65 | 65 | define('NS_CATEGORY_TALK', 15); |
| | 66 | +/** |
| | 67 | + * NS_IMAGE and NS_IMAGE_TALK are the pre-v1.14 names for NS_FILE and |
| | 68 | + * NS_FILE_TALK respectively, and are kept for compatibility. |
| | 69 | + * |
| | 70 | + * When writing code that should be compatible with older MediaWiki |
| | 71 | + * versions, either stick to the old names or define the new constants |
| | 72 | + * yourself, if they're not defined already. |
| | 73 | + */ |
| | 74 | +define('NS_IMAGE', NS_FILE); |
| | 75 | +define('NS_IMAGE_TALK', NS_FILE_TALK); |
| 66 | 76 | /**#@-*/ |
| 67 | 77 | |
| 68 | 78 | /** |
| Index: trunk/phase3/includes/Export.php |
| — | — | @@ -780,7 +780,9 @@ |
| 781 | 781 | "NS_USER_TALK" => NS_USER_TALK, |
| 782 | 782 | "NS_PROJECT" => NS_PROJECT, |
| 783 | 783 | "NS_PROJECT_TALK" => NS_PROJECT_TALK, |
| 784 | | - "NS_IMAGE" => NS_IMAGE, |
| | 784 | + "NS_FILE" => NS_FILE, |
| | 785 | + "NS_FILE_TALK" => NS_FILE_TALK, |
| | 786 | + "NS_IMAGE" => NS_IMAGE, // NS_IMAGE is an alias for NS_FILE |
| 785 | 787 | "NS_IMAGE_TALK" => NS_IMAGE_TALK, |
| 786 | 788 | "NS_MEDIAWIKI" => NS_MEDIAWIKI, |
| 787 | 789 | "NS_MEDIAWIKI_TALK" => NS_MEDIAWIKI_TALK, |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -60,9 +60,11 @@ |
| 61 | 61 | on the user's real name if one is set. Defaults to false (use the username) |
| 62 | 62 | * Removed the 'apiThumbCacheDir' option from $wgForeignFileRepos (only used in |
| 63 | 63 | ForeignAPIRepo) |
| 64 | | -* Image namespace and accompanying talk namespace renamed to File. For backward |
| 65 | | - compatibility purposes, Image still works. External tools may need to be |
| 66 | | - updated. |
| | 64 | +* (bug 44) Image namespace and accompanying talk namespace renamed to File. |
| | 65 | + For backward compatibility purposes, Image still works. External tools may |
| | 66 | + need to be updated. |
| | 67 | +* The constants NS_FILE and NS_FILE_TALK can now be used instead of NS_IMAGE and |
| | 68 | + NS_IMAGE_TALK. The old constants are retained as aliases for compatibility. |
| 67 | 69 | * MediaWiki can be forced to use private IPs forwarded by a proxy server by |
| 68 | 70 | using $wgUsePrivateIPs. |
| 69 | 71 | |