| Index: trunk/phase3/includes/LinksUpdate.php |
| — | — | @@ -110,7 +110,8 @@ |
| 111 | 111 | $existing = $this->getExistingImages(); |
| 112 | 112 | |
| 113 | 113 | $imageDeletes = $this->getImageDeletions( $existing ); |
| 114 | | - $this->incrTableUpdate( 'imagelinks', 'il', $imageDeletes, $this->getImageInsertions( $existing ) ); |
| | 114 | + $this->incrTableUpdate( 'imagelinks', 'il', $imageDeletes, |
| | 115 | + $this->getImageInsertions( $existing ) ); |
| 115 | 116 | |
| 116 | 117 | # Invalidate all image description pages which had links added or removed |
| 117 | 118 | $imageUpdates = $imageDeletes + array_diff_key( $this->mImages, $existing ); |
| — | — | @@ -141,7 +142,8 @@ |
| 142 | 143 | |
| 143 | 144 | $categoryDeletes = $this->getCategoryDeletions( $existing ); |
| 144 | 145 | |
| 145 | | - $this->incrTableUpdate( 'categorylinks', 'cl', $categoryDeletes, $this->getCategoryInsertions( $existing ) ); |
| | 146 | + $this->incrTableUpdate( 'categorylinks', 'cl', $categoryDeletes, |
| | 147 | + $this->getCategoryInsertions( $existing ) ); |
| 146 | 148 | |
| 147 | 149 | # Invalidate all categories which were added, deleted or changed (set symmetric difference) |
| 148 | 150 | $categoryInserts = array_diff_assoc( $this->mCategories, $existing ); |
| — | — | @@ -154,7 +156,8 @@ |
| 155 | 157 | |
| 156 | 158 | $propertiesDeletes = $this->getPropertyDeletions( $existing ); |
| 157 | 159 | |
| 158 | | - $this->incrTableUpdate( 'page_props', 'pp', $propertiesDeletes, $this->getPropertyInsertions( $existing ) ); |
| | 160 | + $this->incrTableUpdate( 'page_props', 'pp', $propertiesDeletes, |
| | 161 | + $this->getPropertyInsertions( $existing ) ); |
| 159 | 162 | |
| 160 | 163 | # Invalidate the necessary pages |
| 161 | 164 | $changed = $propertiesDeletes + array_diff_assoc( $this->mProperties, $existing ); |
| — | — | @@ -362,7 +365,9 @@ |
| 363 | 366 | function getLinkInsertions( $existing = array() ) { |
| 364 | 367 | $arr = array(); |
| 365 | 368 | foreach( $this->mLinks as $ns => $dbkeys ) { |
| 366 | | - $diffs = isset( $existing[$ns] ) ? array_diff_key( $dbkeys, $existing[$ns] ) : $dbkeys; |
| | 369 | + $diffs = isset( $existing[$ns] ) |
| | 370 | + ? array_diff_key( $dbkeys, $existing[$ns] ) |
| | 371 | + : $dbkeys; |
| 367 | 372 | foreach ( $diffs as $dbk => $id ) { |
| 368 | 373 | $arr[] = array( |
| 369 | 374 | 'pl_from' => $this->mId, |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -674,7 +674,8 @@ |
| 675 | 675 | # @todo FIXME: Class depends on skin |
| 676 | 676 | $login_url['class'] = 'link-https'; |
| 677 | 677 | if ( isset($createaccount_url) ) { |
| 678 | | - $https_url = preg_replace( '/^http:/', 'https:', $title->getFullURL("type=signup") ); |
| | 678 | + $https_url = preg_replace( '/^http:/', 'https:', |
| | 679 | + $title->getFullURL("type=signup") ); |
| 679 | 680 | $createaccount_url['href'] = $https_url; |
| 680 | 681 | # @todo FIXME: Class depends on skin |
| 681 | 682 | $createaccount_url['class'] = 'link-https'; |
| — | — | @@ -742,7 +743,8 @@ |
| 743 | 744 | $text = $msg->text(); |
| 744 | 745 | } else { |
| 745 | 746 | global $wgContLang; |
| 746 | | - $text = $wgContLang->getFormattedNsText( MWNamespace::getSubject( $title->getNamespace() ) ); |
| | 747 | + $text = $wgContLang->getFormattedNsText( |
| | 748 | + MWNamespace::getSubject( $title->getNamespace() ) ); |
| 747 | 749 | } |
| 748 | 750 | |
| 749 | 751 | $result = array(); |
| — | — | @@ -1033,7 +1035,8 @@ |
| 1034 | 1036 | 'context' => 'subject' |
| 1035 | 1037 | ); |
| 1036 | 1038 | |
| 1037 | | - wfRunHooks( 'SkinTemplateNavigation::SpecialPage', array( &$this, &$content_navigation ) ); |
| | 1039 | + wfRunHooks( 'SkinTemplateNavigation::SpecialPage', |
| | 1040 | + array( &$this, &$content_navigation ) ); |
| 1038 | 1041 | } |
| 1039 | 1042 | |
| 1040 | 1043 | // Gets list of language variants |
| — | — | @@ -1184,7 +1187,8 @@ |
| 1185 | 1188 | if ( !$out->isPrintable() ) { |
| 1186 | 1189 | $nav_urls['print'] = array( |
| 1187 | 1190 | 'text' => wfMsg( 'printableversion' ), |
| 1188 | | - 'href' => $this->getTitle()->getLocalURL( $wgRequest->appendQueryValue( 'printable', 'yes', true ) ) |
| | 1191 | + 'href' => $this->getTitle()->getLocalURL( |
| | 1192 | + $wgRequest->appendQueryValue( 'printable', 'yes', true ) ) |
| 1189 | 1193 | ); |
| 1190 | 1194 | } |
| 1191 | 1195 | |
| — | — | @@ -1198,7 +1202,8 @@ |
| 1199 | 1203 | } |
| 1200 | 1204 | |
| 1201 | 1205 | // Use the copy of revision ID in case this undocumented, shady hook tries to mess with internals |
| 1202 | | - wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', array( &$this, &$nav_urls, &$revid, &$revid ) ); |
| | 1206 | + wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', |
| | 1207 | + array( &$this, &$nav_urls, &$revid, &$revid ) ); |
| 1203 | 1208 | } |
| 1204 | 1209 | |
| 1205 | 1210 | if( $this->getTitle()->getNamespace() != NS_SPECIAL ) { |
| — | — | @@ -1663,7 +1668,8 @@ |
| 1664 | 1669 | $realAttrs = array( |
| 1665 | 1670 | 'type' => 'submit', |
| 1666 | 1671 | 'name' => $mode, |
| 1667 | | - 'value' => $this->translator->translate( $mode == 'go' ? 'searcharticle' : 'searchbutton' ), |
| | 1672 | + 'value' => $this->translator->translate( |
| | 1673 | + $mode == 'go' ? 'searcharticle' : 'searchbutton' ), |
| 1668 | 1674 | ); |
| 1669 | 1675 | $realAttrs = array_merge( |
| 1670 | 1676 | $realAttrs, |
| — | — | @@ -1685,7 +1691,9 @@ |
| 1686 | 1692 | unset( $buttonAttrs['alt'] ); |
| 1687 | 1693 | $imgAttrs = array( |
| 1688 | 1694 | 'src' => $attrs['src'], |
| 1689 | | - 'alt' => isset( $attrs['alt'] ) ? $attrs['alt'] : $this->translator->translate( 'searchbutton' ), |
| | 1695 | + 'alt' => isset( $attrs['alt'] ) |
| | 1696 | + ? $attrs['alt'] |
| | 1697 | + : $this->translator->translate( 'searchbutton' ), |
| 1690 | 1698 | ); |
| 1691 | 1699 | return Html::rawElement( 'button', $buttonAttrs, Html::element( 'img', $imgAttrs ) ); |
| 1692 | 1700 | default: |