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

Revision: 56348
Author:   purodha
Date:     2009-09-14 23:04:57 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------
partial revert and fix of r56344

Modified Paths:
--------------
    trunk/extensions/Translate/Translate.php
    trunk/extensions/Translate/TranslateEditAddons.php

Modified: trunk/extensions/Translate/Translate.php
===================================================================
--- trunk/extensions/Translate/Translate.php    2009-09-14 22:32:30 UTC (rev 
56347)
+++ trunk/extensions/Translate/Translate.php    2009-09-14 23:04:57 UTC (rev 
56348)
@@ -49,6 +49,7 @@
 $wgSpecialPageGroups['PageTranslation'] = 'pagetools';
 
 $wgHooks['EditPage::showEditForm:initial'][] = 'TranslateEditAddons::addTools';
+$wgHooks['OutputPageBeforeHTML'][] = 'TranslateEditAddons::addNavigation';
 $wgHooks['AlternateEdit'][] = 'TranslateEditAddons::intro';
 $wgHooks['EditPageBeforeEditButtons'][] = 'TranslateEditAddons::buttonHack';
 $wgHooks['EditPage::showEditForm:fields'][] = 
'TranslateEditAddons::keepFields';

Modified: trunk/extensions/Translate/TranslateEditAddons.php
===================================================================
--- trunk/extensions/Translate/TranslateEditAddons.php  2009-09-14 22:32:30 UTC 
(rev 56347)
+++ trunk/extensions/Translate/TranslateEditAddons.php  2009-09-14 23:04:57 UTC 
(rev 56348)
@@ -12,8 +12,11 @@
 class TranslateEditAddons {
        const MSG = 'translate-edit-';
 
-       static function addedNavigation( &$text ) {
+       static function addNavigation( &$outputpage, &$text ) {
                global $wgUser, $wgTitle;
+               static $done = false;
+               if ($done) return true;
+               $done = true;
 
                if ( !self::isMessageNamespace( $wgTitle ) ) return true;
 
@@ -118,8 +121,8 @@
 
        static function addTools( $object ) {
                if ( !self::isMessageNamespace( $object->mTitle ) ) return true;
-
-               TranslateEditAddons::addedNavigation( $object->editFormTextTop 
);
+               
+               TranslateEditAddons::addNavigation( &$ignored, 
$object->editFormTextTop );
                $object->editFormTextTop .= self::editBoxes( $object );
 
                return true;



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to