| Index: trunk/phpwiki/fpw/wikiPage.php |
| — | — | @@ -321,7 +321,7 @@ |
| 322 | 322 | $this->otherLanguages[$topic->namespace] = $iwl ; |
| 323 | 323 | } else if ( $doesItExist ) { |
| 324 | 324 | $linkedLinks[$topic->secureTitle]++ ; |
| 325 | | - if ( $user->options["showHover"] == "yes" ) $hover = "title=\"$link\"" ; |
| | 325 | + if ( $user->options["showHover"] == "yes" ) $hover = "title=\"" . htmlspecialchars ( $link ) . "\"" ; |
| 326 | 326 | #if ( $user->options["underlineLinks"] == "no" ) $linkStyle = " style=\"color:blue;text-decoration:none\"" ; |
| 327 | 327 | $ulink = nurlencode ( $link ) ; |
| 328 | 328 | $s .= "<a href=\"".wikiLink($ulink)."\" $hover$linkStyle>$text</a>" ; |
| — | — | @@ -329,7 +329,7 @@ |
| 330 | 330 | $unlinkedLinks[$link]++ ; |
| 331 | 331 | #$text2 = $text ; |
| 332 | 332 | #$style="" ; |
| 333 | | - if ( $user->options["showHover"] == "yes" ) $hover = "title=\"Edit '$link'\"" ; |
| | 333 | + if ( $user->options["showHover"] == "yes" ) $hover = "title=\"Edit '" . htmlspecialchars ( $link ) . "'\"" ; |
| 334 | 334 | #if ( substr_count ( $text2 , " " ) > 0 ) { |
| 335 | 335 | # if ( $action == "print" ) $text2 = "<$wikiPrintLinksMarkup>$text2</$wikiPrintLinksMarkup>" ; |
| 336 | 336 | # else $text2 = "[$text2]" ; |
| — | — | @@ -1061,9 +1061,12 @@ |
| 1062 | 1062 | function renderPage ( $doPrint = false ) { |
| 1063 | 1063 | global $pageTitle , $diff , $wikiArticleSource , $wikiCurrentServer , $wikiPrintLinksMarkup , $useCachedPages ; |
| 1064 | 1064 | $pageTitle = $this->title ; |
| 1065 | | - if ( isset ( $diff ) ) $middle = $this->doDiff().$this->contents ; |
| | 1065 | + if ( isset ( $diff ) ) { |
| | 1066 | + $middle = $this->doDiff().$this->contents ; |
| | 1067 | + $useCachedPages = false; # A little crude, but effective |
| | 1068 | + } |
| 1066 | 1069 | else $middle = $this->contents ; |
| 1067 | | - if ( $useCachedPages and !$this->isSpecialPage ) { |
| | 1070 | + if ( $useCachedPages and !$this->isSpecialPage) { |
| 1068 | 1071 | if ( $this->cache != "" ) { # Using cache |
| 1069 | 1072 | $middle = $this->cache ; |
| 1070 | 1073 | } else { |