http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98779

Revision: 98779
Author:   nikerabbit
Date:     2011-10-03 17:29:50 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Fix for this fatal:
PHP Fatal error:  Call to a member function getText() on a non-object in 
/www/w/extensions/Translate/utils/TranslationHelpers.php on line 896

Modified Paths:
--------------
    trunk/extensions/Translate/README
    trunk/extensions/Translate/utils/TranslationHelpers.php

Modified: trunk/extensions/Translate/README
===================================================================
--- trunk/extensions/Translate/README   2011-10-03 17:27:06 UTC (rev 98778)
+++ trunk/extensions/Translate/README   2011-10-03 17:29:50 UTC (rev 98779)
@@ -29,6 +29,9 @@
  http://translatewiki.net/docs/Translate/html/
 
 == Change log ==
+* 2011-10-03
+- Fixed an error that sometimes prevented translating messages that had
+  been renamed
 * 2011-10-01
 - Changed index on translate_sections database table
 - Fixed escaping in PythonSingleFFS parser

Modified: trunk/extensions/Translate/utils/TranslationHelpers.php
===================================================================
--- trunk/extensions/Translate/utils/TranslationHelpers.php     2011-10-03 
17:27:06 UTC (rev 98778)
+++ trunk/extensions/Translate/utils/TranslationHelpers.php     2011-10-03 
17:29:50 UTC (rev 98779)
@@ -888,12 +888,13 @@
 
                $latestRevision = $definitionTitle->getLatestRevID();
 
-               $translationRevision =  $db->selectField( 'revtag', 'rt_value', 
$conds, __METHOD__, $options );
+               $translationRevision = $db->selectField( 'revtag', 'rt_value', 
$conds, __METHOD__, $options );
                if ( $translationRevision === false ) {
                        return null;
                }
 
-               $oldtext = Revision::newFromTitle( $definitionTitle, 
$translationRevision )->getText();
+               // Using newFromId instead of newFromTitle, because the page 
might have been renamed
+               $oldtext = Revision::newFromId( $translationRevision 
)->getText();
                $newtext = Revision::newFromTitle( $definitionTitle, 
$latestRevision )->getText();
 
                if ( $oldtext === $newtext ) {


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to