diff options
| author | Mario <mario@mariovavti.com> | 2018-10-08 21:20:17 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-10-08 21:20:17 +0200 |
| commit | 37b94bf5fa71835fe50af6f862e124e24b5db4b4 (patch) | |
| tree | 012afad21875e324bd43051c843fef371c3ddd9d /view | |
| parent | a00a849952eec8f7d7d480f8663446dc1fb7238c (diff) | |
| parent | 709665846e66f093109730691b31d9e094d02088 (diff) | |
| download | volse-hubzilla-37b94bf5fa71835fe50af6f862e124e24b5db4b4.tar.gz volse-hubzilla-37b94bf5fa71835fe50af6f862e124e24b5db4b4.tar.bz2 volse-hubzilla-37b94bf5fa71835fe50af6f862e124e24b5db4b4.zip | |
Merge branch 'fix-wiki-escaping' into 'dev'
Fix wiki escaping (Regression tests needed)
See merge request hubzilla/core!1321
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/wiki.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/wiki_page_not_found.tpl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 2aabc7b5f..0f6fad8e3 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -262,7 +262,8 @@ if (data.success) { window.saved = true; window.console.log('Page saved successfully.'); - window.wiki_page_content = currentContent; + //window.wiki_page_content = currentContent; + window.wiki_page_content = data.content; $('#id_commitMsg').val(''); // Clear the commit message box $('#save-page').addClass('disabled'); // Disable the save button {{if !$mimeType || $mimeType == 'text/markdown'}} diff --git a/view/tpl/wiki_page_not_found.tpl b/view/tpl/wiki_page_not_found.tpl index de98efdf8..bc8afeb53 100644 --- a/view/tpl/wiki_page_not_found.tpl +++ b/view/tpl/wiki_page_not_found.tpl @@ -1,7 +1,7 @@ <h3>Page does not exist</h3> <br /><br /><br /> {{if $canadd}} - <form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" > + <form id="new-page-form" action="/wiki/{{$channel_address}}/create/page" method="post" > <input type="hidden" name="resource_id" value="{{$resource_id}}"> {{include file="field_input.tpl" field=$pageName}} {{if $typelock}} |