| Index: trunk/phase3/includes/upload/UploadBase.php |
| — | — | @@ -362,7 +362,7 @@ |
| 363 | 363 | return array( 'uploadscripted' ); |
| 364 | 364 | } |
| 365 | 365 | if( $this->mFinalExtension == 'svg' || $mime == 'image/svg+xml' ) { |
| 366 | | - if( self::detectScriptInSvg( $this->mTempPath ) ) { |
| | 366 | + if( $this->detectScriptInSvg( $this->mTempPath ) ) { |
| 367 | 367 | return array( 'uploadscripted' ); |
| 368 | 368 | } |
| 369 | 369 | } |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -212,7 +212,7 @@ |
| 213 | 213 | */ |
| 214 | 214 | # $this->mUniqPrefix = "\x07UNIQ" . Parser::getRandomString(); |
| 215 | 215 | # Changed to \x7f to allow XML double-parsing -- TS |
| 216 | | - $this->mUniqPrefix = "\x7fUNIQ" . self::getRandomString(); |
| | 216 | + $this->mUniqPrefix = "\x7fUNIQ" . $this->getRandomString(); |
| 217 | 217 | |
| 218 | 218 | |
| 219 | 219 | # Clear these on every parse, bug 4549 |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -1597,23 +1597,23 @@ |
| 1598 | 1598 | return ucfirst( $str ); |
| 1599 | 1599 | } else { |
| 1600 | 1600 | // fall back to more complex logic in case of multibyte strings |
| 1601 | | - return self::uc( $str, true ); |
| | 1601 | + return $this->uc( $str, true ); |
| 1602 | 1602 | } |
| 1603 | 1603 | } |
| 1604 | 1604 | |
| 1605 | 1605 | function uc( $str, $first = false ) { |
| 1606 | 1606 | if ( function_exists( 'mb_strtoupper' ) ) { |
| 1607 | 1607 | if ( $first ) { |
| 1608 | | - if ( self::isMultibyte( $str ) ) { |
| | 1608 | + if ( $this->isMultibyte( $str ) ) { |
| 1609 | 1609 | return mb_strtoupper( mb_substr( $str, 0, 1 ) ) . mb_substr( $str, 1 ); |
| 1610 | 1610 | } else { |
| 1611 | 1611 | return ucfirst( $str ); |
| 1612 | 1612 | } |
| 1613 | 1613 | } else { |
| 1614 | | - return self::isMultibyte( $str ) ? mb_strtoupper( $str ) : strtoupper( $str ); |
| | 1614 | + return $this->isMultibyte( $str ) ? mb_strtoupper( $str ) : strtoupper( $str ); |
| 1615 | 1615 | } |
| 1616 | 1616 | } else { |
| 1617 | | - if ( self::isMultibyte( $str ) ) { |
| | 1617 | + if ( $this->isMultibyte( $str ) ) { |
| 1618 | 1618 | list( $wikiUpperChars ) = $this->getCaseMaps(); |
| 1619 | 1619 | $x = $first ? '^' : ''; |
| 1620 | 1620 | return preg_replace_callback( |
| — | — | @@ -1632,7 +1632,7 @@ |
| 1633 | 1633 | if ( !$o ) { |
| 1634 | 1634 | return strval( $str ); |
| 1635 | 1635 | } elseif ( $o >= 128 ) { |
| 1636 | | - return self::lc( $str, true ); |
| | 1636 | + return $this->lc( $str, true ); |
| 1637 | 1637 | } elseif ( $o > 96 ) { |
| 1638 | 1638 | return $str; |
| 1639 | 1639 | } else { |
| — | — | @@ -1644,16 +1644,16 @@ |
| 1645 | 1645 | function lc( $str, $first = false ) { |
| 1646 | 1646 | if ( function_exists( 'mb_strtolower' ) ) { |
| 1647 | 1647 | if ( $first ) { |
| 1648 | | - if ( self::isMultibyte( $str ) ) { |
| | 1648 | + if ( $this->isMultibyte( $str ) ) { |
| 1649 | 1649 | return mb_strtolower( mb_substr( $str, 0, 1 ) ) . mb_substr( $str, 1 ); |
| 1650 | 1650 | } else { |
| 1651 | 1651 | return strtolower( substr( $str, 0, 1 ) ) . substr( $str, 1 ); |
| 1652 | 1652 | } |
| 1653 | 1653 | } else { |
| 1654 | | - return self::isMultibyte( $str ) ? mb_strtolower( $str ) : strtolower( $str ); |
| | 1654 | + return $this->isMultibyte( $str ) ? mb_strtolower( $str ) : strtolower( $str ); |
| 1655 | 1655 | } |
| 1656 | 1656 | } else { |
| 1657 | | - if ( self::isMultibyte( $str ) ) { |
| | 1657 | + if ( $this->isMultibyte( $str ) ) { |
| 1658 | 1658 | list( , $wikiLowerChars ) = self::getCaseMaps(); |
| 1659 | 1659 | $x = $first ? '^' : ''; |
| 1660 | 1660 | return preg_replace_callback( |
| — | — | @@ -1672,8 +1672,8 @@ |
| 1673 | 1673 | } |
| 1674 | 1674 | |
| 1675 | 1675 | function ucwords( $str ) { |
| 1676 | | - if ( self::isMultibyte( $str ) ) { |
| 1677 | | - $str = self::lc( $str ); |
| | 1676 | + if ( $this->isMultibyte( $str ) ) { |
| | 1677 | + $str = $this->lc( $str ); |
| 1678 | 1678 | |
| 1679 | 1679 | // regexp to find first letter in each word (i.e. after each space) |
| 1680 | 1680 | $replaceRegexp = "/^([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)| ([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)/"; |
| — | — | @@ -1699,8 +1699,8 @@ |
| 1700 | 1700 | |
| 1701 | 1701 | # capitalize words at word breaks |
| 1702 | 1702 | function ucwordbreaks( $str ) { |
| 1703 | | - if ( self::isMultibyte( $str ) ) { |
| 1704 | | - $str = self::lc( $str ); |
| | 1703 | + if ( $this->isMultibyte( $str ) ) { |
| | 1704 | + $str = $this->lc( $str ); |
| 1705 | 1705 | |
| 1706 | 1706 | // since \b doesn't work for UTF-8, we explicitely define word break chars |
| 1707 | 1707 | $breaks = "[ \-\(\)\}\{\.,\?!]"; |
| Index: trunk/phase3/languages/classes/LanguageKk_cyrl.php |
| — | — | @@ -257,7 +257,7 @@ |
| 258 | 258 | $secondPerson = array( "z" ); // 1st plural, 2nd formal |
| 259 | 259 | $thirdPerson = array( "ı", "i" ); // 3rd |
| 260 | 260 | |
| 261 | | - $lastLetter = self::lastLetter( $word, $allVowels ); |
| | 261 | + $lastLetter = $this->lastLetter( $word, $allVowels ); |
| 262 | 262 | $wordEnding =& $lastLetter[0]; |
| 263 | 263 | $wordLastVowel =& $lastLetter[1]; |
| 264 | 264 | |