Item13480: Remove HIDE_NON_WIKI_WORD_WARNINGS

This is getting too complex. It's easier to just override the templates with the desired changes.
foswiki · Jun 29, 2015 · 82079ee · 82079ee
1 parent 7e69e14
commit 82079ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/core/data/System/DefaultPreferences.txt b/core/data/System/DefaultPreferences.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1434574342" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1435589524" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminToolsCategory"}%
 ---+!! <nop>%WIKITOOLNAME% Site-Level Preferences
 
@@ -48,8 +48,6 @@ Preference settings local to your site should be set in [[%LOCALSITEPREFS%]] (th
    * Prevent automatic linking of [[%SYSTEMWEB%.WikiWords][WikiWords]] and [[%SYSTEMWEB%.ACRONYM][acronyms]] (if set to =on=); link <nop>WikiWords (if empty); can be overwritten by web preferences:
       * Set NOAUTOLINK =
       * *Note:* Use the =[<nop>[...][...]]= syntax to link topics in case you disabled <nop>WikiWord linking. The =&lt;noautolink&gt; ... &lt;/noautolink&gt;= syntax can be used to prevents links within a block of text.
-   * If you use non !WikiWords for topic names (for example "Expenses" or "Mighty1") and if you use bracket notation to link to those topics, it is useful to *turn of all warnings* (like: "WARNING: This topic name is not recommended because it will not be linked automatically") and checkboxes ("Allow non !WikiWord for the new topic name"). Can be overwritten by web preferences. Set to =on= to activate:
-      * Set HIDE_NON_WIKI_WORD_WARNINGS =
 
    * Warn if =%<nop>INCLUDE{}%= of topic fails: Fail silently if empty or =off=. Output warning message (defined in templates/oopsalerts.tmpl) if set to =on=. Otherwise output specific text (use =$topic= for topic). You can override this in web preferences, or by using a =warn="..."= parameter with =%<nop>INCLUDE{}%= :
       * Set INCLUDEWARNING = on

diff --git a/core/data/System/ReleaseNotes01x02.txt b/core/data/System/ReleaseNotes01x02.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1434387485" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1435589524" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="ReleaseHistory"}%
 ---+!! Foswiki Release 1.2.0 Beta 2
 
@@ -66,7 +66,11 @@ Foswiki 1.2 is shipped with the following: ( __New to Foswiki 1.2__ )
    * Perl 5.8.8 is the minimum perl version. The newer the better. There are know issues with international characters and Perl 5.16.x   See [[%BUGS%/Item13424][Item13424]]. For international character set support, Perl 5.18+ is recommended.
 </div>
 
----++ Deprecation
+---++ Deprecation and removals
+
+---+++ Setting HIDE_NON_WIKI_WORD_WARNINGS has been removed
+This setting was used to hide the checkbox for controlling whether or not non-WikiWord topic names are permitted. The checkbox is now always visible.
+The recommended replacement is to use a SKIN setting to override foswiki.tmpl.
 
 ---+++ Space delimited square bracket links have been removed.
 The long-deprecated =[<nop>[http://foswiki.org Spaced title]]= link format has been removed. Links must be written as =[<nop>[url][title]]= format if a title is desired.

diff --git a/core/templates/foswiki.tmpl b/core/templates/foswiki.tmpl
@@ -27,7 +27,7 @@ but may be used in derived templates.
 ---------------------------------------------------
 }%%TMPL:DEF{"onlywikinameallowed"}%<input type="hidden" name="onlywikiname" value="%URLPARAM{"onlywikiname" default="on"}%" />%TMPL:END%%{
 ---------------------------------------------------
-}%%TMPL:DEF{"onlywikiname"}%%IF{"$HIDE_NON_WIKI_WORD_WARNINGS!='on'" then="$percntTMPL:P{$quotonlywikinamewarning$quot}$percnt" else="$percntTMPL:P{$quotonlywikinameallowed$quot}$percnt"}%%TMPL:END%%{
+}%%TMPL:DEF{"onlywikiname"}%%TMPL:P{"onlywikinamewarning"}%%TMPL:END%%{
 ---------------------------------------------------
 }%%TMPL:DEF{"htmldoctype"}%<!DOCTYPE html>
 <html lang="%LANG%">%TMPL:END%%{