summaryrefslogtreecommitdiff
path: root/includes/parser/StripState.php
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-01 15:30:02 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-05-01 15:30:02 -0400
commit1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch)
treef1fdd326034e05177596851be6a7127615d81498 /includes/parser/StripState.php
parent9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff)
parentf6d65e533c62f6deb21342d4901ece24497b433e (diff)
Merge commit 'f6d65'
# Conflicts: # skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/parser/StripState.php')
-rw-r--r--includes/parser/StripState.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/includes/parser/StripState.php b/includes/parser/StripState.php
index 5d1743e6..51ae42dc 100644
--- a/includes/parser/StripState.php
+++ b/includes/parser/StripState.php
@@ -117,12 +117,10 @@ class StripState {
return $text;
}
- wfProfileIn( __METHOD__ );
$oldType = $this->tempType;
$this->tempType = $type;
$text = preg_replace_callback( $this->regex, array( $this, 'unstripCallback' ), $text );
$this->tempType = $oldType;
- wfProfileOut( __METHOD__ );
return $text;
}