| Index: branches/liquidthreads/docs/hooks.txt |
| — | — | @@ -317,6 +317,27 @@ |
| 318 | 318 | Change $bad and return false to override. If an image is "bad", it is not |
| 319 | 319 | rendered inline in wiki pages or galleries in category pages. |
| 320 | 320 | |
| | 321 | +'BeforeGalleryFindFile': before an image is fetched for a gallery |
| | 322 | +&$gallery,: the gallery object |
| | 323 | +&$nt: the image title |
| | 324 | +&$time: image timestamp |
| | 325 | + |
| | 326 | +'BeforeParserFetchTemplateAndtitle': before a template is fetched by Parser |
| | 327 | +&$parser: Parser object |
| | 328 | +&$title: title of the template |
| | 329 | +&$skip: skip this template and link it? |
| | 330 | +&$id: the id of the revision being parsed |
| | 331 | + |
| | 332 | +'BeforeParserMakeImageLinkObj': before an image is rendered by Parser |
| | 333 | +&$parser: Parser object |
| | 334 | +&$nt: the image title |
| | 335 | +&$skip: skip this image and link it? |
| | 336 | +&$time: the image timestamp |
| | 337 | + |
| | 338 | +'BeforeParserrenderImageGallery': before an image gallery is rendered by Parser |
| | 339 | +&$parser: Parser object |
| | 340 | +&$ig: ImageGallery object |
| | 341 | + |
| 321 | 342 | 'BlockIp': before an IP address or user is blocked |
| 322 | 343 | $block: the Block object about to be saved |
| 323 | 344 | $user: the user _doing_ the block (not the one being blocked) |
| — | — | @@ -515,6 +536,9 @@ |
| 516 | 537 | &$sktemplate: SkinTemplate object |
| 517 | 538 | &$tpl: Template engine object |
| 518 | 539 | |
| | 540 | +'TitleLinkUpdatesAfterCompletion': after Linker->doUpdate() is called |
| | 541 | +&$title: title of the updated page |
| | 542 | + |
| 519 | 543 | 'TitleMoveComplete': after moving an article (title) |
| 520 | 544 | $old: old title |
| 521 | 545 | $nt: new title |
| Index: branches/liquidthreads/includes/ProtectionForm.php |
| — | — | @@ -360,7 +360,7 @@ |
| 361 | 361 | * @access private |
| 362 | 362 | */ |
| 363 | 363 | function showLogExtract( &$out ) { |
| 364 | | - # Show relevant lines from the deletion log: |
| | 364 | + # Show relevant lines from the protection log: |
| 365 | 365 | $out->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'protect' ) ) . "</h2>\n" ); |
| 366 | 366 | $logViewer = new LogViewer( |
| 367 | 367 | new LogReader( |
| Index: branches/liquidthreads/includes/Article.php |
| — | — | @@ -852,6 +852,14 @@ |
| 853 | 853 | ); |
| 854 | 854 | } |
| 855 | 855 | |
| | 856 | + /** |
| | 857 | + * If it's a non-existant page, stick the deletion log after the "noarticle" message. |
| | 858 | + * This won't appear when editing a new page, but will when viewing a nonexistant one. |
| | 859 | + */ |
| | 860 | + if ( 0 == $this->getID() ) { |
| | 861 | + $this->showLogExtract( $wgOut ); |
| | 862 | + } |
| | 863 | + |
| 856 | 864 | # Trackbacks |
| 857 | 865 | if ($wgUseTrackbacks) |
| 858 | 866 | $this->addTrackbacks(); |
| Index: branches/liquidthreads/includes/filerepo/LocalFile.php |
| — | — | @@ -1323,7 +1323,7 @@ |
| 1324 | 1324 | */ |
| 1325 | 1325 | class Image extends LocalFile { |
| 1326 | 1326 | function __construct( $title ) { |
| 1327 | | - $repo = FileRepoGroup::singleton()->getLocalRepo(); |
| | 1327 | + $repo = RepoGroup::singleton()->getLocalRepo(); |
| 1328 | 1328 | parent::__construct( $title, $repo ); |
| 1329 | 1329 | } |
| 1330 | 1330 | |
| Index: branches/liquidthreads/includes/EditPage.php |
| — | — | @@ -611,6 +611,8 @@ |
| 612 | 612 | $wgOut->addWikiText( wfMsg( 'newarticletext' ) ); |
| 613 | 613 | else |
| 614 | 614 | $wgOut->addWikiText( wfMsg( 'newarticletextanon' ) ); |
| | 615 | + // Show deletion log when editing new article. |
| | 616 | + $this->mArticle->showLogExtract( $wgOut ); |
| 615 | 617 | } |
| 616 | 618 | } |
| 617 | 619 | |
| Index: branches/liquidthreads/includes/OutputPage.php |
| — | — | @@ -795,7 +795,11 @@ |
| 796 | 796 | $msg = 'blockedtext'; |
| 797 | 797 | } |
| 798 | 798 | |
| 799 | | - $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry ) ); |
| | 799 | + /* $ip returns who *is* being blocked, $intended contains who was meant to be blocked. |
| | 800 | + * This could be a username, an ip range, or a single ip. */ |
| | 801 | + $intended = $wgUser->mBlock->mAddress; |
| | 802 | + |
| | 803 | + $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended ) ); |
| 800 | 804 | |
| 801 | 805 | # Don't auto-return to special pages |
| 802 | 806 | if( $return ) { |
| Index: branches/liquidthreads/includes/api/ApiQueryRecentChanges.php |
| — | — | @@ -51,6 +51,7 @@ |
| 52 | 52 | $this->addTables('recentchanges'); |
| 53 | 53 | $this->addWhereRange('rc_timestamp', $dir, $start, $end); |
| 54 | 54 | $this->addWhereFld('rc_namespace', $namespace); |
| | 55 | + $this->addWhereFld('rc_deleted', 0); |
| 55 | 56 | |
| 56 | 57 | if (!is_null($show)) { |
| 57 | 58 | $show = array_flip($show); |
| Index: branches/liquidthreads/includes/api/ApiQueryWatchlist.php |
| — | — | @@ -125,8 +125,10 @@ |
| 126 | 126 | 'wl_namespace = rc_namespace', |
| 127 | 127 | 'wl_title = rc_title', |
| 128 | 128 | 'rc_cur_id = page_id', |
| 129 | | - 'wl_user' => $userId |
| | 129 | + 'wl_user' => $userId, |
| | 130 | + 'rc_deleted' => 0, |
| 130 | 131 | )); |
| | 132 | + |
| 131 | 133 | $this->addWhereRange('rc_timestamp', $dir, $start, $end); |
| 132 | 134 | $this->addWhereFld('wl_namespace', $namespace); |
| 133 | 135 | $this->addWhereIf('rc_this_oldid=page_latest', !$allrev); |
| Index: branches/liquidthreads/includes/api/ApiQueryUserContributions.php |
| — | — | @@ -129,6 +129,8 @@ |
| 130 | 130 | list ($tbl_page, $tbl_revision) = $this->getDB()->tableNamesN('page', 'revision'); |
| 131 | 131 | $this->addTables("$tbl_revision LEFT OUTER JOIN $tbl_page ON page_id=rev_page"); |
| 132 | 132 | |
| | 133 | + $this->addWhereFld('rev_deleted', 0); |
| | 134 | + |
| 133 | 135 | // We only want pages by the specified user. |
| 134 | 136 | $this->addWhereFld('rev_user_text', $this->userTitle->getText()); |
| 135 | 137 | |
| Index: branches/liquidthreads/includes/api/ApiQueryLogEvents.php |
| — | — | @@ -65,6 +65,7 @@ |
| 66 | 66 | 'log_params' |
| 67 | 67 | )); |
| 68 | 68 | |
| | 69 | + $this->addWhereFld('log_deleted', 0); |
| 69 | 70 | $this->addWhereFld('log_type', $type); |
| 70 | 71 | $this->addWhereRange('log_timestamp', $dir, $start, $end); |
| 71 | 72 | $this->addOption('LIMIT', $limit +1); |
| Index: branches/liquidthreads/includes/SpecialVersion.php |
| — | — | @@ -250,7 +250,10 @@ |
| 251 | 251 | * @return mixed |
| 252 | 252 | */ |
| 253 | 253 | function arrayToString( $list ) { |
| 254 | | - if ( ! is_array( $list ) ) { |
| | 254 | + if( is_object( $list ) ) { |
| | 255 | + $class = get_class( $list ); |
| | 256 | + return "($class)"; |
| | 257 | + } elseif ( ! is_array( $list ) ) { |
| 255 | 258 | return $list; |
| 256 | 259 | } else { |
| 257 | 260 | $class = get_class( $list[0] ); |
| Index: branches/liquidthreads/languages/messages/MessagesEn.php |
| — | — | @@ -939,7 +939,8 @@ |
| 940 | 940 | |
| 941 | 941 | The block was made by $1. The reason given is ''$2''. |
| 942 | 942 | |
| 943 | | -Expiry of block: $6 |
| | 943 | +Expiry of block: $6 |
| | 944 | +Intended blockee: $7 |
| 944 | 945 | |
| 945 | 946 | You can contact $1 or another [[{{MediaWiki:grouppage-sysop}}|administrator]] to discuss the block. |
| 946 | 947 | You cannot use the 'email this user' feature unless a valid email address is specified in your |
| Index: branches/liquidthreads/languages/messages/MessagesHe.php |
| — | — | @@ -117,6 +117,7 @@ |
| 118 | 118 | 'img_center' => array( 1, 'מרכז', 'center', 'centre' ), |
| 119 | 119 | 'img_framed' => array( 1, 'ממוסגר', 'מסגרת', 'framed', 'enframed', 'frame' ), |
| 120 | 120 | 'img_page' => array( 1, 'דף=$1', 'דף $1', 'page=$1', 'page $1' ), |
| | 121 | + 'img_border' => array( 1, 'גבולות', 'גבול', 'border' ), |
| 121 | 122 | 'int' => array( 0, 'הודעה:', 'INT:' ), |
| 122 | 123 | 'sitename' => array( 1, 'שם האתר', 'SITENAME' ), |
| 123 | 124 | 'ns' => array( 0, 'מרחב שם:', 'NS:' ), |
| — | — | @@ -653,6 +654,8 @@ |
| 654 | 655 | |
| 655 | 656 | פקיעת החסימה: \$6 |
| 656 | 657 | |
| | 658 | +טווח החסימה: \$7 |
| | 659 | + |
| 657 | 660 | באפשרותכם ליצור קשר עם \$1 או עם כל אחד מ[[{{ns:project}}:מפעיל מערכת|מפעילי המערכת]] האחרים כדי לדון על החסימה. |
| 658 | 661 | אינכם יכולים להשתמש בתכונת \"שלחו דואר אלקטרוני למשתמש זה\" אם לא ציינתם כתובת דוא\"ל תקפה ב[[{{ns:special}}:Preferences|העדפות המשתמש שלכם]]. |
| 659 | 662 | כתובת ה־IP שלכם היא \$3, ומספר החסימה שלכם הוא #\$5. אנא ציינו אחת מעובדות אלה (או את שתיהן) בכל פנייה למפעילי המערכת.", |
| Index: branches/liquidthreads/languages/messages/MessagesId.php |
| — | — | @@ -707,6 +707,7 @@ |
| 708 | 708 | Blokir dilakukan oleh $1. Alasan yang diberikan adalah ''$2''. |
| 709 | 709 | |
| 710 | 710 | Blokir kadaluwarsa pada: $6 |
| | 711 | +Sasaran pemblokiran: $7 |
| 711 | 712 | |
| 712 | 713 | Anda dapat menghubungi $1 atau [[{{MediaWiki:grouppage-sysop}}|pengurus lainnya]] untuk membicarakan hal ini. |
| 713 | 714 | |
| Index: branches/liquidthreads/languages/messages/MessagesSn.php |
| — | — | @@ -0,0 +1,181 @@ |
| | 2 | +<?php |
| | 3 | +/** Shona (chiShona) |
| | 4 | + * |
| | 5 | + * @addtogroup Language |
| | 6 | + */ |
| | 7 | + |
| | 8 | +$messages = array( |
| | 9 | +# Dates |
| | 10 | +'sunday' => 'Svondo', |
| | 11 | +'monday' => 'Muvhuro', |
| | 12 | +'tuesday' => 'Chipiri', |
| | 13 | +'wednesday' => 'Chitatu', |
| | 14 | +'thursday' => 'China', |
| | 15 | +'friday' => 'Chishanu', |
| | 16 | +'saturday' => 'Mugovera', |
| | 17 | +'january' => 'Ndira', |
| | 18 | +'february' => 'Kukadzi', |
| | 19 | +'march' => 'Kurume', |
| | 20 | +'april' => 'Kubvumbi', |
| | 21 | +'may_long' => 'Chivabvu', |
| | 22 | +'june' => 'Chikumi', |
| | 23 | +'july' => 'Chikunguru', |
| | 24 | +'august' => 'Nyamavhuvhu', |
| | 25 | +'september' => 'Gunyana', |
| | 26 | +'october' => 'Gumiguru', |
| | 27 | +'november' => 'Mbudzi', |
| | 28 | +'december' => 'Zvita', |
| | 29 | +'january-gen' => 'Ndira', |
| | 30 | +'february-gen' => 'Kukadzi', |
| | 31 | +'march-gen' => 'Kurume', |
| | 32 | +'april-gen' => 'Kubvumbi', |
| | 33 | +'may-gen' => 'Chivabvu', |
| | 34 | +'june-gen' => 'Chikumi', |
| | 35 | +'july-gen' => 'Chikunguru', |
| | 36 | +'august-gen' => 'Nyamavhuvhu', |
| | 37 | +'september-gen' => 'Gunyana', |
| | 38 | +'october-gen' => 'Gumiguru', |
| | 39 | +'november-gen' => 'Mbudzi', |
| | 40 | +'december-gen' => 'Zvita', |
| | 41 | + |
| | 42 | +'cancel' => 'Kanzura', |
| | 43 | +'qbedit' => 'Chinja', |
| | 44 | +'qbspecialpages' => 'Mapeji akakosha', |
| | 45 | +'mytalk' => 'Hurukuro dzangu', |
| | 46 | +'navigation' => 'Banguranyika', |
| | 47 | + |
| | 48 | +'help' => 'Rubatsiro', |
| | 49 | +'search' => 'Tsvaga', |
| | 50 | +'searchbutton' => 'Tsvaga', |
| | 51 | +'go' => 'Enda', |
| | 52 | +'searcharticle' => 'Enda', |
| | 53 | +'history_short' => 'Zvemakare', |
| | 54 | +'printableversion' => 'Rinoita kuprinta', |
| | 55 | +'permalink' => 'Zvikochekero Zvisingachinje', |
| | 56 | +'edit' => 'Chinja', |
| | 57 | +'delete' => 'Bharanura', |
| | 58 | +'protect' => 'Chengetedza', |
| | 59 | +'talk' => 'Hurukuro', |
| | 60 | +'toolbox' => 'Maturuzi', |
| | 61 | +'otherlanguages' => 'Mimwe Mitauro', |
| | 62 | + |
| | 63 | +# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations). |
| | 64 | +'currentevents' => 'Zvirikuitika', |
| | 65 | +'currentevents-url' => 'Zvirikuitika', |
| | 66 | +'disclaimers' => 'Matandanyadzi', |
| | 67 | +'edithelp' => 'Mashandurirwo', |
| | 68 | +'mainpage' => 'Peji Rekutanga', |
| | 69 | +'portal' => 'Mukova wegutse', |
| | 70 | +'sitesupport' => 'Zvipo', |
| | 71 | + |
| | 72 | +'newmessageslink' => 'mashoko matsva', |
| | 73 | +'editsection' => 'chinja', |
| | 74 | +'editold' => 'chinja', |
| | 75 | + |
| | 76 | +# Short words for each namespace, by default used in the 'article' tab in monobook |
| | 77 | +'nstab-main' => 'Gani', |
| | 78 | + |
| | 79 | +# General errors |
| | 80 | +'viewsource' => 'Wona mabviro', |
| | 81 | + |
| | 82 | +# Login and logout pages |
| | 83 | +'welcomecreation' => '= Tigashire, $1! == |
| | 84 | + |
| | 85 | +Akaunzi yako yagadzirwa. Usakanganwe kuchinga mapreferences ako eWikipedia.', |
| | 86 | +'yourname' => 'Zita:', |
| | 87 | +'yourpassword' => 'Password:', |
| | 88 | +'yourpasswordagain' => 'Nyorazve password:', |
| | 89 | +'remembermypassword' => 'Ndiyeuke', |
| | 90 | +'login' => 'Gamuchirwa', |
| | 91 | +'userlogin' => 'Gamuchirwa / Gadzira Akaunzi', |
| | 92 | +'logout' => 'Chibuda', |
| | 93 | +'userlogout' => 'Chibuda', |
| | 94 | +'notloggedin' => 'Hauna kugamuchirwa', |
| | 95 | +'createaccount' => 'Gadzira Akaunzi', |
| | 96 | +'youremail' => 'E-mail:', |
| | 97 | +'username' => 'Zita:', |
| | 98 | + |
| | 99 | +# Edit pages |
| | 100 | +'summary' => 'Muchidimbu', |
| | 101 | +'minoredit' => 'Uku kushandurwa kudiki', |
| | 102 | +'watchthis' => 'Ringa peji rino', |
| | 103 | +'savearticle' => 'Kotsa peji', |
| | 104 | +'showpreview' => 'Ratidza chipandwa', |
| | 105 | +'showdiff' => 'Ratidza zvasandurwa', |
| | 106 | + |
| | 107 | +# Search results |
| | 108 | +'powersearch' => 'Tsvaga', |
| | 109 | + |
| | 110 | +# Preferences page |
| | 111 | +'mypreferences' => 'Zvandinosarudza', |
| | 112 | +'prefsnologin' => 'Hauna kugamuchirwa', |
| | 113 | +'prefs-rc' => 'Zvaba Kuchinjwa', |
| | 114 | +'searchresultshead' => 'Tsvaga', |
| | 115 | + |
| | 116 | +# Recent changes |
| | 117 | +'recentchanges' => 'Zvaba Kuchinjwa', |
| | 118 | + |
| | 119 | +# Recent changes linked |
| | 120 | +'recentchangeslinked' => 'Zvinoenderana nezvachinjwa', |
| | 121 | + |
| | 122 | +# Upload |
| | 123 | +'upload' => 'Isa fayera', |
| | 124 | +'uploadbtn' => 'Isa fayera', |
| | 125 | +'uploadnologin' => 'Hauna kugamuchirwa', |
| | 126 | +'watchthisupload' => 'Ringa peji rino', |
| | 127 | + |
| | 128 | +# Miscellaneous special pages |
| | 129 | +'randompage' => 'Peji nhemwa', |
| | 130 | +'specialpages' => 'Mapeji akakosha', |
| | 131 | +'move' => 'Chichinura', |
| | 132 | +'movethispage' => 'Chichinura kupeji iri', |
| | 133 | + |
| | 134 | +# Watchlist |
| | 135 | +'watchlist' => 'Zvandakarinda', |
| | 136 | +'mywatchlist' => 'Zvandakarinda', |
| | 137 | +'watch' => 'Rinda', |
| | 138 | +'watchthispage' => 'Ringa peji rino', |
| | 139 | + |
| | 140 | +# Restrictions (nouns) |
| | 141 | +'restriction-edit' => 'Chinja', |
| | 142 | +'restriction-move' => 'Chichinura', |
| | 143 | + |
| | 144 | +# Undelete |
| | 145 | +'undelete-search-submit' => 'Tsvaga', |
| | 146 | + |
| | 147 | +# Contributions |
| | 148 | +'contributions' => 'Mushandisi Kanzatu', |
| | 149 | +'mycontris' => 'Kanzatu kangu', |
| | 150 | + |
| | 151 | +'sp-contributions-submit' => 'Tsvaga', |
| | 152 | + |
| | 153 | +# What links here |
| | 154 | +'whatlinkshere' => 'Zvakakochekera pano', |
| | 155 | + |
| | 156 | +# Move page |
| | 157 | +'movepage' => 'Chichinura peji', |
| | 158 | +'movepagebtn' => 'Chichinura peji', |
| | 159 | +'movedto' => 'rachichinurwa ku', |
| | 160 | +'1movedto2' => '[[$1]] rachichinurwa ku [[$2]]', |
| | 161 | +'movereason' => 'Chikonzero', |
| | 162 | + |
| | 163 | +# Namespace 8 related |
| | 164 | +'allmessages' => 'Mashoko esystem', |
| | 165 | + |
| | 166 | +# Tooltip help for the actions |
| | 167 | +'tooltip-pt-preferences' => 'Zvandinosarudza', |
| | 168 | +'tooltip-pt-logout' => 'Chibuda', |
| | 169 | +'tooltip-ca-move' => 'Chichinura kupeji iri', |
| | 170 | +'tooltip-p-logo' => 'Peji Rekutanga', |
| | 171 | + |
| | 172 | +# Trackbacks |
| | 173 | +'trackbackremove' => ' ([$1 Delete])', |
| | 174 | + |
| | 175 | +'youhavenewmessagesmulti' => 'Une mashoko matsva pa$1', |
| | 176 | + |
| | 177 | +# Table pager |
| | 178 | +'table_pager_limit_submit' => 'Enda', |
| | 179 | + |
| | 180 | +); |
| | 181 | + |
| | 182 | +?> |
| Property changes on: branches/liquidthreads/languages/messages/MessagesSn.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 183 | + native |
| Index: branches/liquidthreads/RELEASE-NOTES |
| — | — | @@ -49,8 +49,12 @@ |
| 50 | 50 | * Improved thumb.php error handling |
| 51 | 51 | * Display file history on local image description pages of shared images |
| 52 | 52 | * Added $wgArticleRobotPolicies |
| | 53 | +* (bug 10076) Additional parameter $7 added to MediaWiki:Blockedtext |
| | 54 | + containing, the ip, ip range, or username whose block is affecting the |
| | 55 | +* (bug 7691) Deletion log now shown when creating a new article, following |
| | 56 | + MediaWiki:Noarticletext(anon) or MediaWiki:Newarticletext(anon). |
| | 57 | + current user. |
| 53 | 58 | |
| 54 | | - |
| 55 | 59 | == Bugfixes since 1.10 == |
| 56 | 60 | |
| 57 | 61 | * (bug 9712) Use Arabic comma in date/time formats for Arabic and Farsi |
| — | — | @@ -101,6 +105,7 @@ |
| 102 | 106 | * (bug 7993) support mathematical symbol classes |
| 103 | 107 | * (bug 10007) Allow Block IP to work with Postgrs again. |
| 104 | 108 | * Add Google Wireless Transcoder to the Unicode editing blacklist |
| | 109 | +* (bug 10083) Fix for Special:Version breakage on PHP 5.2 with some hooks |
| 105 | 110 | |
| 106 | 111 | |
| 107 | 112 | == MediaWiki API changes since 1.10 == |
| — | — | @@ -162,6 +167,7 @@ |
| 163 | 168 | * Polish (pl) |
| 164 | 169 | * Russian (ru) |
| 165 | 170 | * Slovak (sk) |
| | 171 | +* Shona (sn) |
| 166 | 172 | * Somali (so) |
| 167 | 173 | * Sundanese (su) |
| 168 | 174 | * Swedish (sv) |
| Property changes on: branches/liquidthreads |
| ___________________________________________________________________ |
| Modified: svnmerge-integrated |
| 169 | 175 | - /trunk/phase3:1-22618 |
| 170 | 176 | + /trunk/phase3:1-22651 |