* (bug 28719) Do not call mLinkHolders __destruct explicitly

Patch by Vitaliy Filippov

diff --git a/CREDITS b/CREDITS
index 5c24039..834f3b6 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -144,6 +144,7 @@ following names for their contribution to the product.
 * Tisane
 * Umherirrender
 * Ville Stadista
+* Vitaliy Filippov
 * Yuvaraj Pandian T
 * Zachary Hauri
 

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 31bb386..8576833 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -253,6 +253,7 @@ PHP if you have not done so prior to upgrading MediaWiki.
   parsed messages.
 * (bug 27249) "Installed software" table in Special:Version should always be
   left-to-right.
+* (bug 28719) Do not call mLinkHolders __destruct explicitly
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result.

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index acbfc0e..ee3eb58 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -182,7 +182,7 @@ class Parser {
         */
        function __destruct() {
                if ( isset( $this->mLinkHolders ) ) {
-                       $this->mLinkHolders->__destruct();
+                       unset( $this->mLinkHolders );
                }
                foreach ( $this as $name => $value ) {
                        unset( $this->$name );