Forward port of SVN commit 1147596: Skip redirection URLs when going back or forward in history (otherwise going

back won't be possible for the user, as a redirection will occur again).

CCBUG: 212293

svn path=/trunk/KDE/kdebase/apps/; revision=1147597

1 files changed, 6 insertions, 0 deletions

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index fa6841538..28ffc23e4 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -433,7 +433,13 @@ void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
     Q_UNUSED(oldUrl);
     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);
+    
+    // Assure that the location state is reset for redirection URLs. This
+    // allows to skip redirection URLs when going back or forward in the
+    // URL history.
+    m_urlNavigator->saveLocationState(QByteArray());
     m_urlNavigator->setLocationUrl(newUrl);
+    
     m_urlNavigator->blockSignals(block);
 }