Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3811

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/11/3811/1

fdo#64211 replace / to %2F in HIDs for wiki redirects

Change-Id: I93780b76e17a3b833ef4ee6a50bb0969ab8bb01c
---
M to-wiki/wikiconv2.py
M upload-wiki.pl
2 files changed, 3 insertions(+), 2 deletions(-)



diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 0e3bb5b..00d43d2 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -457,7 +457,7 @@
             self.app = parser.current_app_raw
             self.target = parser.wiki_page_name
             self.authoritative = parser.follow_embed
-            self.redirect = name
+            self.redirect = name.replace("/", "%2F")
 
     def get_all(self):
         global redirects
@@ -1359,7 +1359,7 @@
 def write_redirects():
     print 'Generating the redirects...'
     written = {}
-    # in the first pass, immediately writte the links that are embedded, so that
+    # in the first pass, immediately write the links that are embedded, so that
     # we can always point to that source versions
     for redir in redirects:
         app = redir[0]
diff --git a/upload-wiki.pl b/upload-wiki.pl
index 1337900..13e2bc6 100755
--- a/upload-wiki.pl
+++ b/upload-wiki.pl
@@ -120,6 +120,7 @@
     my $pagename = $File::Find::name;
     $pagename =~ s/^wiki\///;
     $pagename =~ s/\/MAIN$//;
+    $pagename =~ s/%2F/\//g;
 
     # pages starting with lowercase 's' are redirects
     if ( $pagename =~ /^s/ ) {

-- 
To view, visit https://gerrit.libreoffice.org/3811
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93780b76e17a3b833ef4ee6a50bb0969ab8bb01c
Gerrit-PatchSet: 1
Gerrit-Project: help
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar <atimar@suse.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.