Branch: master

5d7f38e7 2014-12-06 01:42:20 Michele Calgaro
Minor update to the Release Notes.
M doc/releasenotes/index.docbook
diff --git a/doc/releasenotes/index.docbook b/doc/releasenotes/index.docbook
index 7dc7e25..f674da6 100644
--- a/doc/releasenotes/index.docbook
+++ b/doc/releasenotes/index.docbook
@@ -190,6 +190,9 @@
 Added support for ARM architectures and RaspBian.
 </para></listitem>
 <listitem><para>
+MIME detection system now based on libmagic.
+</para></listitem>
+<listitem><para>
 New website design.
 </para></listitem>
 </itemizedlist>
867bdce9 2014-12-06 01:42:30 Michele Calgaro
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
M khelpcenter/mainwindow.cpp
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index c224623..d99dfcb 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -293,6 +293,8 @@
 
 void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
 {
+    KParts::URLArgs urlArgs = args;
+
     stop();
 
     TQString proto = url.protocol().lower();
@@ -323,7 +325,15 @@
 
     History::self().createEntry();
 
-    mDoc->browserExtension()->setURLArgs( args );
+    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->gotoAnchor("");
+        }
+    }
+    mDoc->browserExtension()->setURLArgs( urlArgs );
 
     if ( proto == TQString::fromLatin1("glossentry") ) {
         TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() );