Fixed extension function parameter passing

[lhc/web/wiklou.git] / includes / SpecialAllmessages.php

diff --git a/includes/SpecialAllmessages.php b/includes/SpecialAllmessages.php
index 21085bc..d03f210 100644 (file)
--- a/includes/SpecialAllmessages.php
+++ b/includes/SpecialAllmessages.php
@@ -23,13 +23,12 @@ function wfSpecialAllmessages() {
        
        wfProfileIn( "$fname-setup");
        $ot = $wgRequest->getText( 'ot' );
-       $mwMsg =& MagicWord::get( MAG_MSG );
        
-       $navText = wfMsg( 'allmessagestext', $mwMsg->getSynonym( 0 ) );
+       $navText = wfMsg( 'allmessagestext' );
 
 
        $first = true;
-       $sortedArray = $wgAllMessagesEn;
+       $sortedArray = array_merge( $wgAllMessagesEn, $wgMessageCache->mExtensionMessages );
        ksort( $sortedArray );
        $messages = array();
        $wgMessageCache->disableTransform();
@@ -65,20 +64,21 @@ function makePhp($messages) {
        $txt = "\n\n".'$wgAllMessages'.ucfirst($wgLanguageCode).' = array('."\n";
        foreach( $messages as $key => $m ) {
                if(strtolower($wgLanguageCode) != 'en' and $m['msg'] == $m['enmsg'] ) {
-                       if (strstr($m['msg'],"\n")) {
-                               $txt.='/* ';
-                               $comment=' */';
-                       } else {
-                               $txt .= '#';
-                               $comment = '';
-                       }
+                       //if (strstr($m['msg'],"\n")) {
+                       //      $txt.='/* ';
+                       //      $comment=' */';
+                       //} else {
+                       //      $txt .= '#';
+                       //      $comment = '';
+                       //}
+                       continue;
                } elseif ($m['msg'] == '<'.$key.'>'){
                        $m['msg'] = '';
                        $comment = ' #empty';
                } else {
                        $comment = '';
                }
-               $txt .= "'".$key."' => \"".str_replace('"','\"',$m['msg'])."\",$comment\n";
+               $txt .= "'$key' => '" . preg_replace( "/(?<!\\\\)'/", "\'", $m['msg']) . "',$comment\n";
        }
        $txt .= ');';
        return $txt;
@@ -97,12 +97,13 @@ function makeHTMLText( $messages ) {
        $mwnspace = $wgLang->getNsText( NS_MEDIAWIKI );
        $mwtalk = $wgLang->getNsText( NS_MEDIAWIKI_TALK );
        $txt = "
-
-       <table border='1' cellspacing='0' width='100%'>
-       <tr bgcolor='#b2b2ff'>
-               <th>Name</th>
-               <th>Default text</th>
-               <th>Current text</th>
+<table border='1' cellspacing='0' width='100%' id='allmessagestable'>
+       <tr>
+               <th rowspan='2'>" . wfMsgHtml('allmessagesname') . "</th>
+               <th>" . wfMsgHtml('allmessagesdefault') . "</th>
+       </tr>
+       <tr>
+               <th>" . wfMsgHtml('allmessagescurrent') . "</th>
        </tr>";
        
        wfProfileIn( "$fname-check" );
@@ -133,7 +134,7 @@ function makeHTMLText( $messages ) {
                $titleObj =& Title::makeTitle( NS_MEDIAWIKI, $title );
                $talkPage =& Title::makeTitle( NS_MEDIAWIKI_TALK, $title );
 
-               $colorIt = ($m['statmsg'] == $m['msg']) ? " bgcolor=\"#f0f0ff\"" : " bgcolor=\"#ffe2e2\"";
+               $changed = ($m['statmsg'] != $m['msg']);
                $message = htmlspecialchars( $m['statmsg'] );
                $mw = htmlspecialchars( $m['msg'] );
                
@@ -150,15 +151,32 @@ function makeHTMLText( $messages ) {
                        $talkLink = $sk->makeBrokenLinkObj( $talkPage, htmlspecialchars( $talk ) );
                }
 
-               $txt .= 
-               "<tr$colorIt><td>
-               $pageLink<br />
-               $talkLink
+               if($changed) {
+
+                       $txt .=
+       "<tr class='orig'>
+               <td rowspan='2'>
+                       $pageLink<br />$talkLink
                </td><td>
-               $message
+$message
+               </td>
+       </tr><tr class='new'>
+               <td>
+$mw
+               </td>
+       </tr>";
+               } else {
+
+                       $txt .=
+       "<tr class='def'>
+               <td>
+                       $pageLink<br />$talkLink
                </td><td>
-               $mw
-               </td></tr>";
+$mw
+               </td>
+       </tr>";
+
+               }
        }
        $txt .= "</table>";
        wfProfileOut( "$fname-output" );