| Index: trunk/phpwiki/fpw/wikiPage.php |
| — | — | @@ -691,7 +691,7 @@ |
| 692 | 692 | # Don't allow more closing tags than opening tags; normalize tables |
| 693 | 693 | if ( $slash ) { |
| 694 | 694 | if ( $tagcount[$t] < 1 ) |
| 695 | | - break; |
| | 695 | + continue; |
| 696 | 696 | --$tagcount[$t]; |
| 697 | 697 | if($t == "table") |
| 698 | 698 | foreach ( $tabletags as $tt ) |
| — | — | @@ -1020,8 +1020,8 @@ |
| 1021 | 1021 | # Text encoding |
| 1022 | 1022 | if(count($wikiEncodingNames) > 1) { # Shortcut for switching character encodings |
| 1023 | 1023 | global $THESCRIPT; |
| 1024 | | - $u = $THESCRIPT . "?" . getenv("QUERY_STRING"); |
| 1025 | | - $u = getenv ( "REQUEST_URI" ) ; |
| | 1024 | + #$u = $THESCRIPT . "?" . getenv("QUERY_STRING"); |
| | 1025 | + $u = getenv ( "REQUEST_URI" ) ; |
| 1026 | 1026 | $u = preg_replace("/[\?\&]encoding=[0-9]+/", "", $u); |
| 1027 | 1027 | $u .= ((!strchr($u, "?") && strstr($THESCRIPT,$u)) ? "?" : "&"); |
| 1028 | 1028 | foreach ( $wikiEncodingNames as $i => $enc ) { |