dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Only apply DB_MASTER fallback in Revision::fetchText() if READ_LATEST"
[lhc/web/wiklou.git]
/
includes
/
Defines.php
diff --git
a/includes/Defines.php
b/includes/Defines.php
index
b8a0ec0
..
ab02a8e
100644
(file)
--- a/
includes/Defines.php
+++ b/
includes/Defines.php
@@
-43,13
+43,12
@@
define( 'DBO_COMPRESS', 512 );
* Valid database indexes
* Operation-based indexes
*/
* Valid database indexes
* Operation-based indexes
*/
-define( 'DB_
SLAVE', -1 ); # Read from the slave
(or only server)
+define( 'DB_
REPLICA', -1 ); # Read from a replica
(or only server)
define( 'DB_MASTER', -2 ); # Write to master (or only server)
/**@}*/
# Obsolete aliases
define( 'DB_MASTER', -2 ); # Write to master (or only server)
/**@}*/
# Obsolete aliases
-define( 'DB_READ', -1 );
-define( 'DB_WRITE', -2 );
+define( 'DB_SLAVE', -1 );
/**@{
* Virtual namespaces; don't appear in the page database
/**@{
* Virtual namespaces; don't appear in the page database
@@
-181,8
+180,9
@@
define( 'EDIT_UPDATE', 2 );
define( 'EDIT_MINOR', 4 );
define( 'EDIT_SUPPRESS_RC', 8 );
define( 'EDIT_FORCE_BOT', 16 );
define( 'EDIT_MINOR', 4 );
define( 'EDIT_SUPPRESS_RC', 8 );
define( 'EDIT_FORCE_BOT', 16 );
-define( 'EDIT_DEFER_UPDATES', 32 );
+define( 'EDIT_DEFER_UPDATES', 32 );
// Unused since 1.27
define( 'EDIT_AUTOSUMMARY', 64 );
define( 'EDIT_AUTOSUMMARY', 64 );
+define( 'EDIT_INTERNAL', 128 );
/**@}*/
/**@{
/**@}*/
/**@{
@@
-305,3
+305,9
@@
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
define( 'CONTENT_FORMAT_XML', 'application/xml' );
/**@}*/
+
+/**@{
+ * Max string length for shell invocations; based on binfmts.h
+ */
+define( 'SHELL_MAX_ARG_STRLEN', '100000' );
+/**@}*/