| Index: trunk/phase3/includes/User.php |
| — | — | @@ -143,7 +143,6 @@ |
| 144 | 144 | 'reupload', |
| 145 | 145 | 'reupload-shared', |
| 146 | 146 | 'rollback', |
| 147 | | - 'selenium', |
| 148 | 147 | 'sendemail', |
| 149 | 148 | 'siteadmin', |
| 150 | 149 | 'suppressionlog', |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -8,10 +8,10 @@ |
| 9 | 9 | * To customize your installation, edit "LocalSettings.php". If you make |
| 10 | 10 | * changes here, they will be lost on next upgrade of MediaWiki! |
| 11 | 11 | * |
| 12 | | - * Note that since all these string interpolations are expanded |
| 13 | | - * before LocalSettings is included, if you localize something |
| 14 | | - * like $wgScriptPath, you must also localize everything that |
| 15 | | - * depends on it. |
| | 12 | + * In this file, variables whose default values depend on other |
| | 13 | + * variables are set to false. The actual default value of these variables |
| | 14 | + * will only be set in Setup.php, taking into account any custom settings |
| | 15 | + * performed in LocalSettings.php. |
| 16 | 16 | * |
| 17 | 17 | * Documentation is in the source and on: |
| 18 | 18 | * http://www.mediawiki.org/wiki/Manual:Configuration_settings |
| — | — | @@ -113,7 +113,7 @@ |
| 114 | 114 | /** |
| 115 | 115 | * The URL path to index.php. |
| 116 | 116 | * |
| 117 | | - * Defaults to "{$wgScriptPath}/index{$wgScriptExtension}". |
| | 117 | + * Will default to "{$wgScriptPath}/index{$wgScriptExtension}" in Setup.php |
| 118 | 118 | */ |
| 119 | 119 | $wgScript = false; |
| 120 | 120 | |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | * The URL path to redirect.php. This is a script that is used by the Nostalgia |
| 123 | 123 | * skin. |
| 124 | 124 | * |
| 125 | | - * Defaults to "{$wgScriptPath}/redirect{$wgScriptExtension}". |
| | 125 | + * Will default to "{$wgScriptPath}/redirect{$wgScriptExtension}" in Setup.php |
| 126 | 126 | */ |
| 127 | 127 | $wgRedirectScript = false; |
| 128 | 128 | |
| — | — | @@ -140,7 +140,6 @@ |
| 141 | 141 | * |
| 142 | 142 | * These various web and file path variables are set to their defaults |
| 143 | 143 | * in Setup.php if they are not explicitly set from LocalSettings.php. |
| 144 | | - * If you do override them, be sure to set them all! |
| 145 | 144 | * |
| 146 | 145 | * These will relatively rarely need to be set manually, unless you are |
| 147 | 146 | * splitting style sheets or images outside the main document root. |
| — | — | @@ -155,7 +154,7 @@ |
| 156 | 155 | */ |
| 157 | 156 | |
| 158 | 157 | /** |
| 159 | | - * The URL path of the skins directory. Defaults to "{$wgScriptPath}/skins" |
| | 158 | + * The URL path of the skins directory. Will default to "{$wgScriptPath}/skins" in Setup.php |
| 160 | 159 | */ |
| 161 | 160 | $wgStylePath = false; |
| 162 | 161 | $wgStyleSheetPath = &$wgStylePath; |
| — | — | @@ -174,7 +173,7 @@ |
| 175 | 174 | $wgExtensionAssetsPath = false; |
| 176 | 175 | |
| 177 | 176 | /** |
| 178 | | - * Filesystem stylesheets directory. Defaults to "{$IP}/skins" |
| | 177 | + * Filesystem stylesheets directory. Will default to "{$IP}/skins" in Setup.php |
| 179 | 178 | */ |
| 180 | 179 | $wgStyleDirectory = false; |
| 181 | 180 | |
| — | — | @@ -182,13 +181,13 @@ |
| 183 | 182 | * The URL path for primary article page views. This path should contain $1, |
| 184 | 183 | * which is replaced by the article title. |
| 185 | 184 | * |
| 186 | | - * Defaults to "{$wgScript}/$1" or "{$wgScript}?title=$1", depending on |
| 187 | | - * $wgUsePathInfo. |
| | 185 | + * Will default to "{$wgScript}/$1" or "{$wgScript}?title=$1" in Setup.php, |
| | 186 | + * depending on $wgUsePathInfo. |
| 188 | 187 | */ |
| 189 | 188 | $wgArticlePath = false; |
| 190 | 189 | |
| 191 | 190 | /** |
| 192 | | - * The URL path for the images directory. Defaults to "{$wgScriptPath}/images" |
| | 191 | + * The URL path for the images directory. Will default to "{$IP}/images" in Setup.php |
| 193 | 192 | */ |
| 194 | 193 | $wgUploadPath = false; |
| 195 | 194 | |
| — | — | @@ -204,7 +203,7 @@ |
| 205 | 204 | |
| 206 | 205 | /** |
| 207 | 206 | * The URL path of the wiki logo. The logo size should be 135x135 pixels. |
| 208 | | - * Defaults to "{$wgStylePath}/common/images/wiki.png". |
| | 207 | + * Will default to "{$wgStylePath}/common/images/wiki.png" in Setup.php |
| 209 | 208 | */ |
| 210 | 209 | $wgLogo = false; |
| 211 | 210 | |
| — | — | @@ -223,7 +222,7 @@ |
| 224 | 223 | * The local filesystem path to a temporary directory. This is not required to |
| 225 | 224 | * be web accessible. |
| 226 | 225 | * |
| 227 | | - * Defaults to "{$wgUploadDirectory}/tmp". |
| | 226 | + * Will default to "{$wgUploadDirectory}/tmp" in Setup.php |
| 228 | 227 | */ |
| 229 | 228 | $wgTmpDirectory = false; |
| 230 | 229 | |
| — | — | @@ -1663,7 +1662,7 @@ |
| 1664 | 1663 | |
| 1665 | 1664 | /** |
| 1666 | 1665 | * Directory where the cached page will be saved. |
| 1667 | | - * Defaults to "{$wgUploadDirectory}/cache". |
| | 1666 | + * Will default to "{$wgUploadDirectory}/cache" in Setup.php |
| 1668 | 1667 | */ |
| 1669 | 1668 | $wgFileCacheDirectory = false; |
| 1670 | 1669 | |
| — | — | @@ -4414,7 +4413,7 @@ |
| 4415 | 4414 | * Its contents will be shown to users as part of the read-only warning |
| 4416 | 4415 | * message. |
| 4417 | 4416 | * |
| 4418 | | - * Defaults to "{$wgUploadDirectory}/lock_yBgMBwiR". |
| | 4417 | + * Will default to "{$wgUploadDirectory}/lock_yBgMBwiR" in Setup.php |
| 4419 | 4418 | */ |
| 4420 | 4419 | $wgReadOnlyFile = false; |
| 4421 | 4420 | |