From: Tim Starling <tstarling@wikimedia.org>
Date: Wed, 19 Nov 2014 03:25:45 +0000 (+1100)
Subject: Fix vim folding
X-Git-Tag: 1.31.0-rc.0~13251
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=3a45b422f5e84677810e630a0a5c54f07f29a804;p=lhc%2Fweb%2Fwiklou.git

Fix vim folding

The "@{" in these two doc comments was being interpreted as an opening
mark and was causing almost the whole file to be in a single section.

Change-Id: I818ecd2f7621a22b6e8f5a4b93faee6fbf3664dc
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e822655f87..65ad4032f9 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1383,7 +1383,7 @@ $wgDjvuOutputExtension = 'jpg';
 /**
  * Site admin email address.
  *
- * Defaults to "wikiadmin@{$wgServerName}".
+ * Defaults to "wikiadmin@$wgServerName".
  */
 $wgEmergencyContact = false;
 
@@ -1392,7 +1392,7 @@ $wgEmergencyContact = false;
  *
  * The address we should use as sender when a user is requesting his password.
  *
- * Defaults to "apache@{$wgServerName}".
+ * Defaults to "apache@$wgServerName".
  */
 $wgPasswordSender = false;