| Index: branches/liquidthreads/maintenance/language/messages.inc |
| — | — | @@ -1265,6 +1265,7 @@ |
| 1266 | 1266 | 'istemplate', |
| 1267 | 1267 | 'whatlinkshere-prev', |
| 1268 | 1268 | 'whatlinkshere-next', |
| | 1269 | + 'whatlinkshere-links', |
| 1269 | 1270 | ), |
| 1270 | 1271 | 'block' => array( |
| 1271 | 1272 | 'blockip', |
| Index: branches/liquidthreads/maintenance/language/messageTypes.inc |
| — | — | @@ -99,7 +99,6 @@ |
| 100 | 100 | 'talkpagetext', |
| 101 | 101 | 'trackback', |
| 102 | 102 | 'trackbackexcerpt', |
| 103 | | - 'widthheight', |
| 104 | 103 | ); |
| 105 | 104 | |
| 106 | 105 | /** Optional messages, which may be translated only if changed in the other language. */ |
| — | — | @@ -164,6 +163,8 @@ |
| 165 | 164 | 'variantname-kk-cn', |
| 166 | 165 | 'variantname-kk', |
| 167 | 166 | 'rc-change-size', |
| | 167 | + 'resetpass_text', |
| | 168 | + 'widthheight', |
| 168 | 169 | ); |
| 169 | 170 | |
| 170 | 171 | /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ |
| Index: branches/liquidthreads/includes/GlobalFunctions.php |
| — | — | @@ -592,7 +592,7 @@ |
| 593 | 593 | } elseif ( in_array('parseinline', $options) ) { |
| 594 | 594 | $string = $wgOut->parse( $string, true, true ); |
| 595 | 595 | $m = array(); |
| 596 | | - if( preg_match( '/^<p>(.*)\n?<\/p>$/s', $string, $m ) ) { |
| | 596 | + if( preg_match( '/^<p>(.*)\n?<\/p>$/sU', $string, $m ) ) { |
| 597 | 597 | $string = $m[1]; |
| 598 | 598 | } |
| 599 | 599 | } elseif ( in_array('parsemag', $options) ) { |
| Index: branches/liquidthreads/includes/SpecialWhatlinkshere.php |
| — | — | @@ -230,6 +230,10 @@ |
| 231 | 231 | $wgOut->addHTML( ' (' . implode( ', ', $props ) . ') ' ); |
| 232 | 232 | } |
| 233 | 233 | |
| | 234 | + //add whatlinkshere link |
| | 235 | + $whatlink=$this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Whatlinkshere', $nt->getPrefixedDBkey() ), wfMsgHtml( 'whatlinkshere-links' ) ); |
| | 236 | + $wgOut->addHTML(' ' . $whatlink); |
| | 237 | + |
| 234 | 238 | if ( $row->page_is_redirect ) { |
| 235 | 239 | if ( $level < 2 ) { |
| 236 | 240 | $this->showIndirectLinks( $level + 1, $nt, 500 ); |
| Index: branches/liquidthreads/includes/SpecialBlockip.php |
| — | — | @@ -61,7 +61,7 @@ |
| 62 | 62 | $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', $byDefault ); |
| 63 | 63 | $this->BlockEnableAutoblock = $wgRequest->getBool( 'wpEnableAutoblock', $byDefault ); |
| 64 | 64 | # Re-check user's rights to hide names, very serious, defaults to 0 |
| 65 | | - $this->BlockHideName = $wgRequest->getBool( 'wpHideName', 0 ) && $wgUser->isAllowed( 'hideuser' ); |
| | 65 | + $this->BlockHideName = ( $wgRequest->getBool( 'wpHideName', 0 ) && $wgUser->isAllowed( 'hideuser' ) ) ? 1 : 0; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | function showForm( $err ) { |
| Index: branches/liquidthreads/includes/DatabasePostgres.php |
| — | — | @@ -561,7 +561,7 @@ |
| 562 | 562 | } |
| 563 | 563 | |
| 564 | 564 | function affectedRows() { |
| 565 | | - if( !isset( $this->mLastResult ) ) |
| | 565 | + if( !isset( $this->mLastResult ) or ! $this->mLastResult ) |
| 566 | 566 | return 0; |
| 567 | 567 | |
| 568 | 568 | return pg_affected_rows( $this->mLastResult ); |
| Index: branches/liquidthreads/languages/messages/MessagesEn.php |
| — | — | @@ -1312,7 +1312,7 @@ |
| 1313 | 1313 | 'recentchanges-url' => 'Special:Recentchanges', |
| 1314 | 1314 | 'recentchangestext' => 'Track the most recent changes to the wiki on this page.', |
| 1315 | 1315 | 'recentchanges-feed-description' => 'Track the most recent changes to the wiki in this feed.', |
| 1316 | | -'rcnote' => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|last '''$2''' days}}, as of $3.", |
| | 1316 | +'rcnote' => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|'''$2''' days}}, as of $3.", |
| 1317 | 1317 | 'rcnotefrom' => "Below are the changes since <b>$2</b> (up to <b>$1</b> shown).", |
| 1318 | 1318 | 'rclistfrom' => "Show new changes starting from $1", |
| 1319 | 1319 | 'rcshowhideminor' => '$1 minor edits', |
| — | — | @@ -1958,6 +1958,7 @@ |
| 1959 | 1959 | 'istemplate' => 'inclusion', |
| 1960 | 1960 | 'whatlinkshere-prev' => '{{PLURAL:$1|previous|previous $1}}', |
| 1961 | 1961 | 'whatlinkshere-next' => '{{PLURAL:$1|next|next $1}}', |
| | 1962 | +'whatlinkshere-links' => '(? links)', |
| 1962 | 1963 | |
| 1963 | 1964 | # Block/unblock IP |
| 1964 | 1965 | # |
| Index: branches/liquidthreads/languages/messages/MessagesDe.php |
| — | — | @@ -260,7 +260,7 @@ |
| 261 | 261 | |
| 262 | 262 | 'about' => 'Über', |
| 263 | 263 | 'article' => 'Seite', |
| 264 | | -'newwindow' => '(wird in einem neuen Fenster geöffnet)', |
| | 264 | +'newwindow' => '(öffnet sich in neuem Fenster)', |
| 265 | 265 | 'cancel' => 'Abbrechen', |
| 266 | 266 | 'qbfind' => 'Finden', |
| 267 | 267 | 'qbbrowse' => 'Blättern', |
| — | — | @@ -540,7 +540,6 @@ |
| 541 | 541 | # Password reset dialog |
| 542 | 542 | 'resetpass' => 'Passwort für Benutzerkonto zurücksetzen', |
| 543 | 543 | 'resetpass_announce' => 'Anmeldung mit dem per E-Mail zugesandten Code. Um die Anmeldung abzuschließen, müssen Sie jetzt ein neues Passwort wählen.', |
| 544 | | -'resetpass_text' => '<!-- Add text here -->', |
| 545 | 544 | 'resetpass_header' => 'Passwort zurücksetzen', |
| 546 | 545 | 'resetpass_submit' => 'Passwort übermitteln und anmelden', |
| 547 | 546 | 'resetpass_success' => 'Ihr Passwort wurde erfolgreich geändert. Es folgt die Anmeldung …', |
| — | — | @@ -1533,6 +1532,7 @@ |
| 1534 | 1533 | 'istemplate' => 'Vorlageneinbindung', |
| 1535 | 1534 | 'whatlinkshere-prev' => '{{PLURAL:$1|vorheriger|vorherige $1}}', |
| 1536 | 1535 | 'whatlinkshere-next' => '{{PLURAL:$1|nächster|nächste $1}}', |
| | 1536 | +'whatlinkshere-links' => '(← Links)', |
| 1537 | 1537 | |
| 1538 | 1538 | # Block/unblock |
| 1539 | 1539 | 'blockip' => 'IP-Adresse/Benutzer sperren', |
| Index: branches/liquidthreads/languages/Names.php |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | 'gu' => 'ગુજરાતી', # Gujarati |
| 93 | 93 | 'gv' => 'Gaelg', # Manx |
| 94 | 94 | 'ha' => 'هَوُسَ', # Hausa |
| 95 | | - 'hak' => 'Hak-kâ-fâ', # Hakka |
| | 95 | + 'hak' => 'Hak-kâ-fa', # Hakka |
| 96 | 96 | 'haw' => 'Hawai`i', # Hawaiian |
| 97 | 97 | 'he' => 'עברית', # Hebrew |
| 98 | 98 | 'hi' => 'हिन्दी', # Hindi |
| Index: branches/liquidthreads/RELEASE-NOTES |
| — | — | @@ -42,6 +42,7 @@ |
| 43 | 43 | * (bug 6072) Introducing 'border' keyword to the [[Image:]] syntax |
| 44 | 44 | * Introducing 'frameless' keyword to [[Image:]] syntax which respects the |
| 45 | 45 | user preferences for image width like 'thumb' but without a frame. |
| | 46 | +* (bug 7960) Link to "what links here" for each "what links here" entry |
| 46 | 47 | |
| 47 | 48 | == Bugfixes since 1.10 == |
| 48 | 49 | |
| — | — | @@ -91,6 +92,7 @@ |
| 92 | 93 | * (bug 908) Unexistent special pages now generate a red link. |
| 93 | 94 | * (bug 7899) Added \hline and \vline to the list of allowed TeX commands |
| 94 | 95 | * (bug 7993) support mathematical symbol classes |
| | 96 | +* (bug 10007) Allow Block IP to work with Postgrs again. |
| 95 | 97 | |
| 96 | 98 | == MediaWiki API changes since 1.10 == |
| 97 | 99 | |
| Property changes on: branches/liquidthreads |
| ___________________________________________________________________ |
| Modified: svnmerge-integrated |
| 98 | 100 | - /trunk/phase3:1-22517 |
| 99 | 101 | + /trunk/phase3:1-22547 |