Merge "define RC_EXTERNAL type for recent changes"

diff --combined includes/Defines.php
index 2ddd053,c096122..882f318
--- 1/includes/Defines.php
--- 2/includes/Defines.php
+++ b/includes/Defines.php
@@@ -39,7 -39,7 +39,7 @@@ define( 'MW_SPECIALPAGE_VERSION', 2 )
  define( 'DBO_DEBUG', 1 );
  define( 'DBO_NOBUFFER', 2 );
  define( 'DBO_IGNORE', 4 );
 -define( 'DBO_TRX', 8 );
 +define( 'DBO_TRX', 8 ); // automatically start transaction on first query
  define( 'DBO_DEFAULT', 16 );
  define( 'DBO_PERSISTENT', 32 );
  define( 'DBO_SYSDBA', 64 ); //for oracle maintenance
@@@ -171,11 -171,12 +171,12 @@@ define( 'MW_DATE_ISO', 'ISO 8601' )
  /**@{
   * RecentChange type identifiers
   */
- define( 'RC_EDIT', 0);
- define( 'RC_NEW', 1);
- define( 'RC_MOVE', 2); // obsolete
- define( 'RC_LOG', 3);
- define( 'RC_MOVE_OVER_REDIRECT', 4); // obsolete
+ define( 'RC_EDIT', 0 );
+ define( 'RC_NEW', 1 );
+ define( 'RC_MOVE', 2 ); // obsolete
+ define( 'RC_LOG', 3 );
+ define( 'RC_MOVE_OVER_REDIRECT', 4 ); // obsolete
+ define( 'RC_EXTERNAL', 5 );
  /**@}*/
  
  /**@{
@@@ -213,7 -214,6 +214,7 @@@ require_once __DIR__.'/normal/UtfNormal
  define( 'MW_SUPPORTS_EDITFILTERMERGED', 1 );
  define( 'MW_SUPPORTS_PARSERFIRSTCALLINIT', 1 );
  define( 'MW_SUPPORTS_LOCALISATIONCACHE', 1 );
 +define( 'MW_SUPPORTS_CONTENTHANDLER', 1 );
  /**@}*/
  
  /** Support for $wgResourceModules */
@@@ -262,7 -262,7 +263,7 @@@ define( 'APCOND_BLOCKED', 8 )
  define( 'APCOND_ISBOT', 9 );
  /**@}*/
  
 -/**
 +/** @{
   * Protocol constants for wfExpandUrl()
   */
  define( 'PROTO_HTTP', 'http://' );
@@@ -271,35 -271,3 +272,35 @@@ define( 'PROTO_RELATIVE', '//' )
  define( 'PROTO_CURRENT', null );
  define( 'PROTO_CANONICAL', 1 );
  define( 'PROTO_INTERNAL', 2 );
 +/**@}*/
 +
 +/**@{
 + * Content model ids, used by Content and ContentHandler.
 + * These IDs will be exposed in the API and XML dumps.
 + *
 + * Extensions that define their own content model IDs should take
 + * care to avoid conflicts. Using the extension name as a prefix is recommended,
 + * for example 'myextension-somecontent'.
 + */
 +define( 'CONTENT_MODEL_WIKITEXT', 'wikitext' );
 +define( 'CONTENT_MODEL_JAVASCRIPT', 'javascript' );
 +define( 'CONTENT_MODEL_CSS', 'css' );
 +define( 'CONTENT_MODEL_TEXT', 'text' );
 +/**@}*/
 +
 +/**@{
 + * Content formats, used by Content and ContentHandler.
 + * These should be MIME types, and will be exposed in the API and XML dumps.
 + *
 + * Extensions are free to use the below formats, or define their own.
 + * It is recommended to stick with the conventions for MIME types.
 + */
 +define( 'CONTENT_FORMAT_WIKITEXT', 'text/x-wiki' ); // wikitext
 +define( 'CONTENT_FORMAT_JAVASCRIPT', 'text/javascript' ); // for js pages
 +define( 'CONTENT_FORMAT_CSS', 'text/css' );  // for css pages
 +define( 'CONTENT_FORMAT_TEXT', 'text/plain' ); // for future use, e.g. with some plain-html messages.
 +define( 'CONTENT_FORMAT_HTML', 'text/html' ); // for future use, e.g. with some plain-html messages.
 +define( 'CONTENT_FORMAT_SERIALIZED', 'application/vnd.php.serialized' ); // for future use with the api and for extensions
 +define( 'CONTENT_FORMAT_JSON', 'application/json' ); // for future use with the api, and for use by extensions
 +define( 'CONTENT_FORMAT_XML', 'application/xml' ); // for future use with the api, and for use by extensions
 +/**@}*/