[geeklog-hg] geeklog: Allow "Wiki-style Format" as default post mode (bug #00...

[geeklog-cvs at lists.geeklog.net]

changeset 9368:8830d7f56f75
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/8830d7f56f75
user: Kenji ITO <mystralkk at gmail.com>
date: Thu Jan 02 22:37:26 2014 +0900
description:
Allow "Wiki-style Format" as default post mode (bug #0001731)

diffstat:

 language/english.php                           |  5 +++--
 language/english_utf-8.php                     |  5 +++--
 language/japanese_utf-8.php                    |  5 +++--
 public_html/admin/configuration_validation.php |  2 +-
 system/classes/story.class.php                 |  3 ++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diffs (91 lines):

diff -r c50780e885ae -r 8830d7f56f75 language/english.php
--- a/language/english.php	Wed Jan 01 11:04:29 2014 -0500
+++ b/language/english.php	Thu Jan 02 22:37:26 2014 +0900
@@ -1860,7 +1860,8 @@
 
 $LANG_postmodes = array(
     'plaintext' => 'Plain Old Text',
-    'html'      => 'HTML Formatted'
+    'html'      => 'HTML Formatted',
+    'wikitext'  => 'Wiki-style format'
 );
 
 $LANG_sortcodes = array(
@@ -2285,7 +2286,7 @@
                "Check IP and Site URL" => 5,
                "Check IP and Full URL" => 6,
                "Check IP, Full URL, and Site URL" => 7),
-    5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+    5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
     6 => array('12'=>'12','24'=>'24'),
     7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
     8 => array('Right'=>'right', 'Left'=>'left'),
diff -r c50780e885ae -r 8830d7f56f75 language/english_utf-8.php
--- a/language/english_utf-8.php	Wed Jan 01 11:04:29 2014 -0500
+++ b/language/english_utf-8.php	Thu Jan 02 22:37:26 2014 +0900
@@ -1860,7 +1860,8 @@
 
 $LANG_postmodes = array(
     'plaintext' => 'Plain Old Text',
-    'html'      => 'HTML Formatted'
+    'html'      => 'HTML Formatted',
+    'wikitext'  => 'Wiki-style format'
 );
 
 $LANG_sortcodes = array(
@@ -2285,7 +2286,7 @@
                "Check IP and Site URL" => 5,
                "Check IP and Full URL" => 6,
                "Check IP, Full URL, and Site URL" => 7),
-    5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+    5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
     6 => array('12'=>'12','24'=>'24'),
     7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
     8 => array('Right'=>'right', 'Left'=>'left'),
diff -r c50780e885ae -r 8830d7f56f75 language/japanese_utf-8.php
--- a/language/japanese_utf-8.php	Wed Jan 01 11:04:29 2014 -0500
+++ b/language/japanese_utf-8.php	Thu Jan 02 22:37:26 2014 +0900
@@ -1862,7 +1862,8 @@
 
 $LANG_postmodes = array(
     'plaintext' => 'テキスト',
-    'html' => 'HTML'
+    'html'      => 'HTML',
+    'wikitext'  => 'Wikiスタイル'
 );
 
 $LANG_sortcodes = array(
@@ -2279,7 +2280,7 @@
     2 => array('拒否' => 0, '最新ポストのみ保持' => 1, 'マルチポストを許可' => 2),
     3 => array('トラックバックを有効' => 0, 'トラックバックを停止' => -1),
     4 => array('何も検査しない' => 0, 'サイトのURLリンクを検査' => 1, '完å
¨ãªURLを検査' => 2, 'サイトのURLと完å
¨ãªURLを検査' => 3, 'IPアドレスとサイトのIPアドレスを検査' => 4, 'IPアドレスとサイトのURLリンクを検査' => 5, 'IPアドレスと完å
¨ãªURLを検査' => 6, 'IPアドレス、完å
¨ãªURL、サイトのURLを検査' => 7),
-    5 => array('テキスト' => 'plaintext', 'HTML' => 'html'),
+    5 => array('テキスト' => 'plaintext', 'HTML' => 'html', 'Wikiスタイル' => 'wikitext'),
     6 => array('12' => 12, '24' => 24),
     7 => array('最後のページ' => 'last', '最初のページ' => 'first', '各ページ' => 'all'),
     8 => array('右' => 'right', '左' => 'left'),
diff -r c50780e885ae -r 8830d7f56f75 public_html/admin/configuration_validation.php
--- a/public_html/admin/configuration_validation.php	Wed Jan 01 11:04:29 2014 -0500
+++ b/public_html/admin/configuration_validation.php	Thu Jan 02 22:37:26 2014 +0900
@@ -359,7 +359,7 @@
 $_CONF_VALIDATE['Core']['storysubmission'] = array('rule' => 'boolean');
 $_CONF_VALIDATE['Core']['listdraftstories'] = array('rule' => 'boolean');
 $_CONF_VALIDATE['Core']['postmode'] = array(
-    'rule' => array('inList', array('html', 'plaintext'), true)
+    'rule' => array('inList', array('html', 'plaintext', 'wikitext'), true)
 );
 $_CONF_VALIDATE['Core']['speedlimit'] = array('rule' => 'numeric');
 $_CONF_VALIDATE['Core']['skip_preview'] = array('rule' => 'boolean');
diff -r c50780e885ae -r 8830d7f56f75 system/classes/story.class.php
--- a/system/classes/story.class.php	Wed Jan 01 11:04:29 2014 -0500
+++ b/system/classes/story.class.php	Thu Jan 02 22:37:26 2014 +0900
@@ -555,7 +555,8 @@
             $this->_numemails = 0;
 
             if (($_CONF['advanced_editor'] && $_USER['advanced_editor']) &&
-                    ($_CONF['postmode'] != 'plaintext')) {
+                    ($_CONF['postmode'] !== 'plaintext') &&
+                    ($_CONF['postmode'] !== 'wikitext')) {
                 $this->_advanced_editor_mode = 1;
                 $this->_postmode = 'adveditor';
             } else {