| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -1882,7 +1882,7 @@ |
| 1883 | 1883 | elseif ( ';' === $char ) { |
| 1884 | 1884 | $result .= '<dl><dt>'; |
| 1885 | 1885 | $this->mDTopen = true; |
| 1886 | | - } elseif ( '>' === $char ) { $result .= "<blockquote><p>"; } |
| | 1886 | + } |
| 1887 | 1887 | else { $result = '<!-- ERR 1 -->'; } |
| 1888 | 1888 | |
| 1889 | 1889 | return $result; |
| — | — | @@ -1890,7 +1890,6 @@ |
| 1891 | 1891 | |
| 1892 | 1892 | /* private */ function nextItem( $char ) { |
| 1893 | 1893 | if ( '*' === $char || '#' === $char ) { return '</li><li>'; } |
| 1894 | | - elseif ( '>' === $char ) { return "</p><p>"; } |
| 1895 | 1894 | elseif ( ':' === $char || ';' === $char ) { |
| 1896 | 1895 | $close = '</dd>'; |
| 1897 | 1896 | if ( $this->mDTopen ) { $close = '</dt>'; } |
| — | — | @@ -1908,7 +1907,6 @@ |
| 1909 | 1908 | /* private */ function closeList( $char ) { |
| 1910 | 1909 | if ( '*' === $char ) { $text = '</li></ul>'; } |
| 1911 | 1910 | elseif ( '#' === $char ) { $text = '</li></ol>'; } |
| 1912 | | - elseif ( '>' === $char ) { $text = "</p></blockquote>"; } |
| 1913 | 1911 | elseif ( ':' === $char ) { |
| 1914 | 1912 | if ( $this->mDTopen ) { |
| 1915 | 1913 | $this->mDTopen = false; |
| — | — | @@ -1954,23 +1952,14 @@ |
| 1955 | 1953 | // # = ol |
| 1956 | 1954 | // ; = dt |
| 1957 | 1955 | // : = dd |
| 1958 | | - // > = blockquote |
| 1959 | 1956 | |
| 1960 | 1957 | $lastPrefixLength = strlen( $lastPrefix ); |
| 1961 | 1958 | $preCloseMatch = preg_match('/<\\/pre/i', $oLine ); |
| 1962 | 1959 | $preOpenMatch = preg_match('/<pre/i', $oLine ); |
| 1963 | | - |
| 1964 | | - // Need to decode > --> > for blockquote syntax. Re-encode later. |
| 1965 | | - // To avoid collision with real >s, we temporarily convert them to > |
| 1966 | | - // This is a weird choice of armouring, but it's totally resistant to any |
| 1967 | | - // collision. |
| 1968 | | - $orig = $oLine; |
| 1969 | | - $oLine = strtr( $oLine, array( '>' => '>', '>' => '>' ) ); |
| 1970 | | - |
| 1971 | 1960 | // If not in a <pre> element, scan for and figure out what prefixes are there. |
| 1972 | 1961 | if ( !$this->mInPre ) { |
| 1973 | 1962 | # Multiple prefixes may abut each other for nested lists. |
| 1974 | | - $prefixLength = strspn( $oLine, '*#:;>' ); |
| | 1963 | + $prefixLength = strspn( $oLine, '*#:;' ); |
| 1975 | 1964 | $prefix = substr( $oLine, 0, $prefixLength ); |
| 1976 | 1965 | |
| 1977 | 1966 | # eh? |
| — | — | @@ -1986,9 +1975,6 @@ |
| 1987 | 1976 | $prefix = $prefix2 = ''; |
| 1988 | 1977 | $t = $oLine; |
| 1989 | 1978 | } |
| 1990 | | - |
| 1991 | | - // Re-encode >s now |
| 1992 | | - $t = strtr( $t, array( '>' => '>', '>' => '>' ) ); |
| 1993 | 1979 | |
| 1994 | 1980 | # List generation |
| 1995 | 1981 | if( $prefixLength && $lastPrefix === $prefix2 ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -136,7 +136,6 @@ |
| 137 | 137 | * Added a feature to allow per-article process pool size control for the parsing |
| 138 | 138 | task, to limit resource usage when the cache for a heavily-viewed article is |
| 139 | 139 | invalidated. Requires an external daemon. |
| 140 | | -* Leading > is now syntax for <blockquote>. |
| 141 | 140 | * (bug 19576) Moved the id attribues from the anchors accompanying section |
| 142 | 141 | headers to the <span class="mw-headline"> elements within the section headers, |
| 143 | 142 | removing the redundant anchor elements. |
| Index: trunk/phase3/maintenance/parserTests.txt |
| — | — | @@ -6577,9 +6577,9 @@ |
| 6578 | 6578 | !! test |
| 6579 | 6579 | Always escape literal '>' in output, not just after '<' |
| 6580 | 6580 | !! input |
| 6581 | | -test ><> |
| | 6581 | +><> |
| 6582 | 6582 | !! result |
| 6583 | | -<p>test ><> |
| | 6583 | +<p>><> |
| 6584 | 6584 | </p> |
| 6585 | 6585 | !! end |
| 6586 | 6586 | |
| — | — | @@ -7399,24 +7399,6 @@ |
| 7400 | 7400 | </p> |
| 7401 | 7401 | !! end |
| 7402 | 7402 | |
| 7403 | | -!! test |
| 7404 | | -Leading > blockquote syntax |
| 7405 | | -!! input |
| 7406 | | -> Hi |
| 7407 | | -> This |
| 7408 | | -> Is |
| 7409 | | -> A |
| 7410 | | -> Quote |
| 7411 | | -!! result |
| 7412 | | -<blockquote><p> Hi |
| 7413 | | -</p><p> This |
| 7414 | | -</p><p> Is |
| 7415 | | -</p><p> A |
| 7416 | | -</p><p> Quote |
| 7417 | | -</p></blockquote> |
| 7418 | | - |
| 7419 | | -!! end |
| 7420 | | - |
| 7421 | 7403 | # |
| 7422 | 7404 | # |
| 7423 | 7405 | # |