X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=64cfd17d7013be27c3e6cb316c34e5ecb397dd11;hb=65294205a1cda97c5c20f1c1e0495252b54fcdcd;hp=e9262bc22f9d28513d56df177b1661838ae391a2;hpb=aded554d70f7d2b3b836c14a80cd4a66151db42f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e9262bc22f..64cfd17d70 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -257,6 +257,23 @@ $wgFileCacheDirectory = false;
  */
 $wgLogo = false;
 
+/**
+ * Array with URL paths to HD versions of the wiki logo. The scaled logo size
+ * should be under 135x155 pixels.
+ * Only 1.5x and 2x versions are supported.
+ *
+ * @par Example:
+ * @code
+ * $wgLogoHD = array(
+ *	"1.5x" => "path/to/1.5x_version.png",
+ *	"2x" => "path/to/2x_version.png"
+ * );
+ * @endcode
+ *
+ * @since 1.25
+ */
+$wgLogoHD = false;
+
 /**
  * The URL path of the shortcut icon.
  * @since 1.6
@@ -6672,8 +6689,6 @@ $wgLogActions = array(
 	'protect/modify' => 'modifiedarticleprotection',
 	'protect/unprotect' => 'unprotectedarticle',
 	'protect/move_prot' => 'movedarticleprotection',
-	'import/upload' => 'import-logentry-upload',
-	'import/interwiki' => 'import-logentry-interwiki',
 );
 
 /**
@@ -6708,6 +6723,8 @@ $wgLogActionsHandlers = array(
 	'block/reblock' => 'BlockLogFormatter',
 	'suppress/block' => 'BlockLogFormatter',
 	'suppress/reblock' => 'BlockLogFormatter',
+	'import/upload' => 'LogFormatter',
+	'import/interwiki' => 'LogFormatter',
 );
 
 /**
@@ -7420,6 +7437,34 @@ $wgPageLanguageUseDB = false;
  */
 $wgUseLinkNamespaceDBFields = true;
 
+/**
+ * Global configuration variable for Virtual REST Services.
+ * Parameters for different services are to be declared inside
+ * $wgVirtualRestConfig['modules'], which is to be treated as an associative
+ * array. Global parameters will be merged with service-specific ones. The
+ * result will then be passed to VirtualRESTService::__construct() in the
+ * module.
+ *
+ * Example config for Parsoid:
+ *
+ *   $wgVirtualRestConfig['modules']['parsoid'] = array(
+ *     'url' => 'http://localhost:8000',
+ *     'prefix' => 'enwiki',
+ *   );
+ *
+ * @var array
+ * @since 1.25
+ */
+$wgVirtualRestConfig = array(
+	'modules' => array(),
+	'global' => array(
+		# Timeout in seconds
+		'timeout' => 360,
+		'forwardCookies' => false,
+		'HTTPProxy' => null
+	)
+);
+
 /**
  * For really cool vim folding this needs to be at the end:
  * vim: foldmarker=@{,@} foldmethod=marker