Moved some defines to Defines.php, removed unnecessary line from Language::getUserToggle()

This commit is contained in:
Tim Starling 2004-10-24 12:03:29 +00:00
parent 2914a8611c
commit 62c933c9c8
2 changed files with 13 additions and 12 deletions

View file

@ -5,7 +5,7 @@
*/
/**#@+
* Database related global
* Database related constants
*/
define( 'DBO_DEBUG', 1 );
define( 'DBO_NOBUFFER', 2 );
@ -15,14 +15,14 @@ define( 'DBO_DEFAULT', 16 );
/**#@-*/
/**#@+
* Virtual namespace; it doesn't appear in the page database
* Virtual namespaces; don't appear in the page database
*/
define('NS_MEDIA', -2);
define('NS_SPECIAL', -1);
/**#@-*/
/**#@+
* Real namespace
* Real namespaces
*/
define('NS_MAIN', 0);
define('NS_TALK', 1);
@ -44,7 +44,7 @@ define('NS_CATEGORY_TALK', 15);
/**#@+
* Fix the code and remove these...
* @todo Global that need to be removed after code cleaning
* @todo Constants that need to be removed after code cleaning
* @deprecated
*/
define('NS_WP', NS_PROJECT);
@ -62,4 +62,13 @@ $wgFeedClasses = array(
'rss' => 'RSSFeed',
'atom' => 'AtomFeed',
);
define( 'MW_MATH_PNG', 0 );
define( 'MW_MATH_SIMPLE', 1 );
define( 'MW_MATH_HTML', 2 );
define( 'MW_MATH_SOURCE', 3 );
define( 'MW_MATH_MODERN', 4 );
define( 'MW_MATH_MATHML', 5 );
?>

View file

@ -76,13 +76,6 @@ if(isset($wgExtraNamespaces)) {
'chick' => 'Chick'
);
define( 'MW_MATH_PNG', 0 );
define( 'MW_MATH_SIMPLE', 1 );
define( 'MW_MATH_HTML', 2 );
define( 'MW_MATH_SOURCE', 3 );
define( 'MW_MATH_MODERN', 4 );
define( 'MW_MATH_MATHML', 5 );
# Validation types
$wgValidationTypesEn = array (
'0' => "Style|Awful|Awesome|5",
@ -1717,7 +1710,6 @@ class Language {
}
function getUserToggle( $tog ) {
$togs =& $this->getUserToggles();
return wfMsg("tog-".$tog);
}