| Index: trunk/phase3/includes/SpecialNewpages.php |
| — | — | @@ -75,6 +75,7 @@ |
| 76 | 76 | global $wgLang, $wgContLang, $wgUser, $wgUseRCPatrol; |
| 77 | 77 | $u = $result->user; |
| 78 | 78 | $ut = $result->user_text; |
| | 79 | + $dirmark = $wgContLang->getDirMark(); // To keep text in correct order |
| 79 | 80 | |
| 80 | 81 | $length = wfMsgExt( 'nbytes', array('parsemag', 'escape'), |
| 81 | 82 | $wgLang->formatNum( $result->length ) ); |
| — | — | @@ -89,10 +90,12 @@ |
| 90 | 91 | $link = $skin->makeKnownLink( $ns . ':' . $result->title, '' ); |
| 91 | 92 | } |
| 92 | 93 | |
| 93 | | - $userTools = $skin->userLink( $u, $ut ) . $skin->userToolLinks( $u, $ut ); |
| | 94 | + $userLink = $skin->userLink( $u, $ut ); |
| | 95 | + $userTools = $skin->userToolLinks( $u, $ut ); |
| 94 | 96 | |
| 95 | | - $s = "{$d} {$link} ({$length}) . . {$userTools}"; |
| 96 | | - $s .= $skin->commentBlock( $result->comment ); |
| | 97 | + $s = "{$d} {$dirmark}{$link} {$dirmark}({$length}) . . " . |
| | 98 | + "{$dirmark}{$userLink}{$dirmark}{$userTools}"; |
| | 99 | + $s .= $dirmark . $skin->commentBlock( $result->comment ); |
| 97 | 100 | return $s; |
| 98 | 101 | } |
| 99 | 102 | |
| Index: trunk/phase3/includes/SpecialImagelist.php |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | * |
| 11 | 11 | */ |
| 12 | 12 | function wfSpecialImagelist() { |
| 13 | | - global $wgUser, $wgOut, $wgLang, $wgRequest, $wgMiserMode; |
| | 13 | + global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest, $wgMiserMode; |
| 14 | 14 | |
| 15 | 15 | $sort = $wgRequest->getVal( 'sort' ); |
| 16 | 16 | $wpIlMatch = $wgRequest->getText( 'wpIlMatch' ); |
| — | — | @@ -95,6 +95,8 @@ |
| 96 | 96 | $ul = $sk->makeLinkObj( Title::makeTitle( NS_USER, $ut ), $ut ); |
| 97 | 97 | } |
| 98 | 98 | |
| | 99 | + $dirmark = $wgContLang->getDirMark(); // to keep text in correct direction |
| | 100 | + |
| 99 | 101 | $ilink = "<a href=\"" . htmlspecialchars( Image::imageUrl( $name ) ) . |
| 100 | 102 | "\">" . strtr(htmlspecialchars( $name ), '_', ' ') . "</a>"; |
| 101 | 103 | |
| — | — | @@ -107,7 +109,8 @@ |
| 108 | 110 | $date = $wgLang->timeanddate( $s->img_timestamp, true ); |
| 109 | 111 | $comment = $sk->commentBlock( $s->img_description ); |
| 110 | 112 | |
| 111 | | - $l = "({$desc}) {$ilink} . . {$nb} . . {$ul} . . {$date} {$comment}<br />\n"; |
| | 113 | + $l = "({$desc}) {$dirmark}{$ilink} . . {$dirmark}{$nb} . . {$dirmark}{$ul}". |
| | 114 | + " . . {$dirmark}{$date} . . {$dirmark}{$comment}<br />\n"; |
| 112 | 115 | $wgOut->addHTML( $l ); |
| 113 | 116 | } |
| 114 | 117 | |
| Index: trunk/phase3/includes/SpecialUnwatchedpages.php |
| — | — | @@ -51,7 +51,7 @@ |
| 52 | 52 | $plink = $skin->makeKnownLinkObj( $nt, htmlspecialchars( $text ) ); |
| 53 | 53 | $wlink = $skin->makeKnownLinkObj( $nt, wfMsgHtml( 'watch' ), 'action=watch' ); |
| 54 | 54 | |
| 55 | | - return $plink . ' (' . $wlink . ')'; |
| | 55 | + return wfSpecialList( $plink, $wlink ); |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
| Index: trunk/phase3/includes/SpecialShortpages.php |
| — | — | @@ -58,7 +58,9 @@ |
| 59 | 59 | $title = Title::makeTitle( $result->namespace, $result->title ); |
| 60 | 60 | $link = $skin->makeKnownLinkObj( $title, htmlspecialchars( $wgContLang->convert( $title->getPrefixedText() ) ) ); |
| 61 | 61 | $histlink = $skin->makeKnownLinkObj( $title, wfMsgHtml('hist'), 'action=history' ); |
| 62 | | - return "({$histlink}) $link ({$nb})"; |
| | 62 | + $dirmark = $wgContLang->getDirMark(); |
| | 63 | + |
| | 64 | + return "({$histlink}) {$dirmark}$link {$dirmark}({$nb})"; |
| 63 | 65 | } |
| 64 | 66 | } |
| 65 | 67 | |
| Index: trunk/phase3/includes/SpecialUnusedtemplates.php |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' ), |
| 45 | 45 | wfMsgHtml( 'unusedtemplateswlh' ), |
| 46 | 46 | 'target=' . $title->getPrefixedUrl() ); |
| 47 | | - return( $pageLink . ' (' . $wlhLink . ')' ); |
| | 47 | + return wfSpecialList( $pageLink, $wlhLink ); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | function getPageHeader() { |
| Index: trunk/phase3/includes/SpecialUnusedimages.php |
| — | — | @@ -48,17 +48,25 @@ |
| 49 | 49 | $title = Title::makeTitle( NS_IMAGE, $result->title ); |
| 50 | 50 | |
| 51 | 51 | $imageUrl = htmlspecialchars( Image::imageUrl( $result->title ) ); |
| | 52 | + $dirmark = $wgContLang->getDirMark(); // To keep text in correct order |
| | 53 | + |
| 52 | 54 | $return = |
| 53 | 55 | # The 'desc' linking to the image page |
| 54 | | - '('.$skin->makeKnownLinkObj( $title, wfMsg('imgdesc') ).') ' |
| | 56 | + '('.$skin->makeKnownLinkObj( $title, wfMsg('imgdesc') ).') ' . $dirmark . |
| | 57 | + |
| 55 | 58 | # Link to the image itself |
| 56 | | - . '<a href="' . $imageUrl . '">' . htmlspecialchars( $title->getText() ) . '</a>' |
| | 59 | + '<a href="' . $imageUrl . '">' . htmlspecialchars( $title->getText() ) . |
| | 60 | + '</a> . . ' . $dirmark . |
| | 61 | + |
| 57 | 62 | # Last modified date |
| 58 | | - . ' . . '.$wgLang->timeanddate($result->value) |
| | 63 | + $wgLang->timeanddate($result->value) . ' . . ' . $dirmark . |
| | 64 | + |
| 59 | 65 | # Link to username |
| 60 | | - . ' . . '.$skin->makeLinkObj( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text) |
| | 66 | + $skin->makeLinkObj( Title::makeTitle( NS_USER, $result->img_user_text ), |
| | 67 | + $result->img_user_text) . $dirmark . |
| | 68 | + |
| 61 | 69 | # If there is a description, show it |
| 62 | | - . $skin->commentBlock( $wgContLang->convert( $result->img_description ) ); |
| | 70 | + $skin->commentBlock( $wgContLang->convert( $result->img_description ) ); |
| 63 | 71 | |
| 64 | 72 | return $return; |
| 65 | 73 | } |