| Index: branches/REL1_18/extensions/FCKeditor/FCKeditorSkin.body.php |
| — | — | @@ -68,18 +68,18 @@ |
| 69 | 69 | if( $thumb ) { |
| 70 | 70 | $ret .= "_fck_mw_type=\"thumb"."\" "; |
| 71 | 71 | $class .= "fck_mw_frame"; |
| 72 | | - } elseif( $framed ) { |
| | 72 | + } else if( $framed ) { |
| 73 | 73 | $ret .= "_fck_mw_type=\"frame"."\" "; |
| 74 | 74 | $class .= "fck_mw_frame"; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | if( $align == 'right' ) { |
| 78 | 78 | $class .= ( $class ? ' ' : '' ) . 'fck_mw_right'; |
| 79 | | - } elseif( $align == 'center' ) { |
| | 79 | + } else if( $align == 'center' ) { |
| 80 | 80 | $class .= ( $class ? ' ' : '' ) . 'fck_mw_center'; |
| 81 | | - } elseif( $align == 'left' ) { |
| | 81 | + } else if( $align == 'left' ) { |
| 82 | 82 | $class .= ( $class ? ' ' : '' ) . 'fck_mw_left'; |
| 83 | | - } elseif( $framed || $thumb ) { |
| | 83 | + } else if( $framed || $thumb ) { |
| 84 | 84 | $class .= ( $class ? ' ' : '' ) . 'fck_mw_right'; |
| 85 | 85 | } |
| 86 | 86 | |
| Index: branches/REL1_18/extensions/FCKeditor/FCKeditorSajax.body.php |
| — | — | @@ -109,19 +109,19 @@ |
| 110 | 110 | $ns = NS_CATEGORY; |
| 111 | 111 | $term = substr( $term, 9 ); |
| 112 | 112 | $prefix = 'Category:'; |
| 113 | | - } elseif( strpos( strtolower( $term ), ':category:' ) === 0 ) { |
| | 113 | + } else if( strpos( strtolower( $term ), ':category:' ) === 0 ) { |
| 114 | 114 | $ns = NS_CATEGORY; |
| 115 | 115 | $term = substr( $term, 10 ); |
| 116 | 116 | $prefix = ':Category:'; |
| 117 | | - } elseif( strpos( strtolower( $term ), 'media:' ) === 0 ) { |
| | 117 | + } else if( strpos( strtolower( $term ), 'media:' ) === 0 ) { |
| 118 | 118 | $ns = NS_IMAGE; |
| 119 | 119 | $term = substr( $term, 6 ); |
| 120 | 120 | $prefix = 'Media:'; |
| 121 | | - } elseif( strpos( strtolower( $term ), ':image:' ) === 0 ) { |
| | 121 | + } else if( strpos( strtolower( $term ), ':image:' ) === 0 ) { |
| 122 | 122 | $ns = NS_IMAGE; |
| 123 | 123 | $term = substr( strtolower( $term ), 7 ); |
| 124 | 124 | $prefix = ':Image:'; |
| 125 | | - } elseif( strpos( $term, ':' ) && is_array( $wgExtraNamespaces ) ) { |
| | 125 | + } else if( strpos( $term, ':' ) && is_array( $wgExtraNamespaces ) ) { |
| 126 | 126 | $pos = strpos( $term, ':' ); |
| 127 | 127 | $find_ns = array_search( substr( $term, 0, $pos ), $wgExtraNamespaces ); |
| 128 | 128 | if( $find_ns ) { |
| — | — | @@ -201,7 +201,7 @@ |
| 202 | 202 | /// @todo FIXME: should use Database class |
| 203 | 203 | $sql = "SELECT tmpSelectCatPage.page_title AS title FROM ".$dbr->tableName('categorylinks')." AS tmpSelectCat ". |
| 204 | 204 | "LEFT JOIN ".$dbr->tableName('page')." AS tmpSelectCatPage ON tmpSelectCat.cl_from = tmpSelectCatPage.page_id ". |
| 205 | | - "WHERE tmpSelectCat.cl_to LIKE ".$dbr->addQuotes($m_root)." AND tmpSelectCatPage.page_namespace = $ns"; |
| | 205 | + "WHERE tmpSelectCat.cl_to LIKE ".$dbr->addQuotes($m_root)." AND tmpSelectCatPage.page_namespace = $ns"; |
| 206 | 206 | |
| 207 | 207 | $res = $dbr->query( $sql, __METHOD__ ); |
| 208 | 208 | $ret = ''; |
| Index: branches/REL1_18/extensions/FCKeditor/FCKeditorParser.body.php |
| — | — | @@ -389,7 +389,7 @@ |
| 390 | 390 | if( $sum == 1 && $lastSum == 0 ) { |
| 391 | 391 | $stringToParse .= strtr( substr( $text, $startingPos, $pos - $startingPos ), $strtr ); |
| 392 | 392 | $startingPos = $pos; |
| 393 | | - } elseif( $sum == 0 ) { |
| | 393 | + } else if( $sum == 0 ) { |
| 394 | 394 | $stringToParse .= 'Fckmw' . $this->fck_mw_strtr_span_counter . 'fckmw'; |
| 395 | 395 | $inner = htmlspecialchars( strtr( substr( $text, $startingPos, $pos - $startingPos + 19 ), $strtr ) ); |
| 396 | 396 | $this->fck_mw_strtr_span['href="Fckmw' . $this->fck_mw_strtr_span_counter . 'fckmw"'] = 'href="' . $inner . '"'; |
| — | — | @@ -627,7 +627,7 @@ |
| 628 | 628 | } else { |
| 629 | 629 | $inBlockElem = true; |
| 630 | 630 | } |
| 631 | | - } elseif ( !$inBlockElem && !$this->mInPre ) { |
| | 631 | + } else if ( !$inBlockElem && !$this->mInPre ) { |
| 632 | 632 | if ( ' ' == $t{0} and ( $this->mLastSection == 'pre' or trim( $t ) != '' ) ) { |
| 633 | 633 | // pre |
| 634 | 634 | if( $this->mLastSection != 'pre' ) { |
| — | — | @@ -657,7 +657,7 @@ |
| 658 | 658 | $output .= $paragraphStack; |
| 659 | 659 | $paragraphStack = false; |
| 660 | 660 | $this->mLastSection = 'p'; |
| 661 | | - } elseif ($this->mLastSection != 'p') { |
| | 661 | + } else if ($this->mLastSection != 'p') { |
| 662 | 662 | $output .= $this->closeParagraph().'<p>'; |
| 663 | 663 | $this->mLastSection = 'p'; |
| 664 | 664 | } |
| Index: branches/REL1_18/extensions/FCKeditor/FCKeditor.body.php |
| — | — | @@ -465,7 +465,7 @@ |
| 466 | 466 | |
| 467 | 467 | if ( !( typeof(oDoc.FCK) == "undefined" ) && !( typeof(oDoc.FCK.EditingArea) == "undefined" ) ){ |
| 468 | 468 | txtarea = oDoc.FCK.EditingArea.Textarea; |
| 469 | | - } elseif( oDoc.editform ){ |
| | 469 | + } else if( oDoc.editform ){ |
| 470 | 470 | // if we have FCK enabled, behave differently... |
| 471 | 471 | if ( showFCKEditor & RTE_VISIBLE ){ |
| 472 | 472 | SRCiframe = oDoc.getElementById( 'wpTextbox1___Frame' ); |
| — | — | @@ -501,7 +501,7 @@ |
| 502 | 502 | // save window scroll position |
| 503 | 503 | if ( oDoc.documentElement && oDoc.documentElement.scrollTop ) |
| 504 | 504 | var winScroll = oDoc.documentElement.scrollTop; |
| 505 | | - elseif ( oDoc.body ) |
| | 505 | + else if ( oDoc.body ) |
| 506 | 506 | var winScroll = oDoc.body.scrollTop; |
| 507 | 507 | |
| 508 | 508 | // get current selection |
| — | — | @@ -522,10 +522,10 @@ |
| 523 | 523 | // restore window scroll position |
| 524 | 524 | if ( oDoc.documentElement && oDoc.documentElement.scrollTop ) |
| 525 | 525 | oDoc.documentElement.scrollTop = winScroll; |
| 526 | | - elseif ( oDoc.body ) |
| | 526 | + else if ( oDoc.body ) |
| 527 | 527 | oDoc.body.scrollTop = winScroll; |
| 528 | 528 | |
| 529 | | - } elseif ( txtarea.selectionStart || txtarea.selectionStart == '0' ){ // Mozilla |
| | 529 | + } else if ( txtarea.selectionStart || txtarea.selectionStart == '0' ){ // Mozilla |
| 530 | 530 | |
| 531 | 531 | // save textarea scroll position |
| 532 | 532 | var textScroll = txtarea.scrollTop; |
| — | — | @@ -539,7 +539,7 @@ |
| 540 | 540 | if( !selText ){ |
| 541 | 541 | selText = sampleText; |
| 542 | 542 | isSample = true; |
| 543 | | - } elseif( selText.charAt(selText.length - 1) == ' ' ){ //exclude ending space char |
| | 543 | + } else if( selText.charAt(selText.length - 1) == ' ' ){ //exclude ending space char |
| 544 | 544 | selText = selText.substring(0, selText.length - 1); |
| 545 | 545 | tagClose += ' '; |
| 546 | 546 | } |
| — | — | @@ -563,7 +563,7 @@ |
| 564 | 564 | if( !selText ) { |
| 565 | 565 | selText = sampleText; |
| 566 | 566 | isSample = true; |
| 567 | | - } elseif( selText.charAt(selText.length - 1) == ' ' ) { //exclude ending space char |
| | 567 | + } else if( selText.charAt(selText.length - 1) == ' ' ) { //exclude ending space char |
| 568 | 568 | selText = selText.substring(0, selText.length - 1); |
| 569 | 569 | tagClose += ' ' |
| 570 | 570 | } |
| — | — | @@ -594,7 +594,7 @@ |
| 595 | 595 | // Remove the mwSetupToolbar onload hook to avoid a JavaScript error with FF. |
| 596 | 596 | if ( window.removeEventListener ) |
| 597 | 597 | window.removeEventListener( 'load', mwSetupToolbar, false ); |
| 598 | | - elseif ( window.detachEvent ) |
| | 598 | + else if ( window.detachEvent ) |
| 599 | 599 | window.detachEvent( 'onload', mwSetupToolbar ); |
| 600 | 600 | mwSetupToolbar = function(){ return false ; }; |
| 601 | 601 | |
| Property changes on: branches/REL1_18/extensions/FCKeditor/FCKeditor.body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 602 | 602 | Merged /trunk/extensions/FCKeditor/FCKeditor.body.php:r93422 |
| Property changes on: branches/REL1_18/extensions/FCKeditor |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 603 | 603 | Merged /trunk/extensions/FCKeditor:r93422,97886-97887,97899,97969,98054,98179,98432,98497,98607,98654,98773,98801,98960,98982,99022,99059,99097,99164,99167,99187,99193,99653,99897,100092,100504,100516,100573,100689,100692,100699,102848,102962,103675,104049,104162,104337,104360,104621,104867,107043,107120,107337 |