diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-06-04 08:11:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-06-04 08:12:55 +0900 |
commit | 2d6b8219e794e15336455c193165a996721a48ad (patch) | |
tree | 96564ba1efead8e4192bbfb3d9ad2295356f443d | |
parent | c656ead5f597985a6dbdac3ae7cc33aac46bbcaa (diff) | |
download | tdebase-2d6b8219e794e15336455c193165a996721a48ad.tar.gz tdebase-2d6b8219e794e15336455c193165a996721a48ad.zip |
Revert remaining part of commit 687b146. This resolves bug 1850 and reopens bug 2188.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 900f593b6b33dd6028def8e3f7f595819cbbf2f1)
-rw-r--r-- | khelpcenter/mainwindow.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index b4c25dba6..c2246232a 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -293,8 +293,6 @@ void MainWindow::viewUrl( const TQString &url ) void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args ) { - KParts::URLArgs urlArgs = args; - stop(); TQString proto = url.protocol().lower(); @@ -325,14 +323,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args ) History::self().createEntry(); - if (mDoc->baseURL() != url) { - if ( proto == "help" ) { - // Ensure that changing the handbook section works by forcing a reload of the page, - // thereby allowing the help tdeioslave to re-parse the fragment identifier - urlArgs.reload = true; - } - } - mDoc->browserExtension()->setURLArgs( urlArgs ); + mDoc->browserExtension()->setURLArgs( args ); if ( proto == TQString::fromLatin1("glossentry") ) { TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() ); |