[geeklog-cvs] geeklog: Fixed dropdown for the "censor mode", which has more th...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ee900b120ca7
changeset: 6946:ee900b120ca7
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Apr 13 19:31:28 2009 +0200
description:
Fixed dropdown for the "censor mode", which has more than the two options offered previously (bug #0000692)

diffstat:

4 files changed, 9 insertions(+), 1 deletion(-)
public_html/admin/install/config-install.php |    2 +-
public_html/docs/history                     |    2 ++
sql/updates/mssql_1.5.2_to_1.6.0.php         |    3 +++
sql/updates/mysql_1.5.2_to_1.6.0.php         |    3 +++

diffs (50 lines):

diff -r 23beb1e0bbb1 -r ee900b120ca7 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Mon Apr 13 18:08:11 2009 +0200
+++ b/public_html/admin/install/config-install.php	Mon Apr 13 19:31:28 2009 +0200
@@ -331,7 +331,7 @@
     $c->add('allowed_protocols',array('http','ftp','https'),'%text',7,34,NULL,1740,TRUE);
 
     $c->add('fs_censoring', NULL, 'fieldset', 7, 35, NULL, 0, TRUE);
-    $c->add('censormode',1,'select',7,35,0,1760,TRUE);
+    $c->add('censormode',1,'select',7,35,18,1760,TRUE);
     $c->add('censorreplace','*censored*','text',7,35,NULL,1770,TRUE);
     $c->add('censorlist', array('fuck','cunt','fucker','fucking','pussy','cock','c0ck',' cum ','twat','clit','bitch','fuk','fuking','motherfucker'),'%text',7,35,NULL,1780,TRUE);
 
diff -r 23beb1e0bbb1 -r ee900b120ca7 public_html/docs/history
--- a/public_html/docs/history	Mon Apr 13 18:08:11 2009 +0200
+++ b/public_html/docs/history	Mon Apr 13 19:31:28 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed dropdown for the "censor mode", which has more than the two options
+  offered previously (bug #0000692) [Mike, Maciej Cupial]
 - Slightly faster template class (feature request #0000760, patches provided
   by dengen and mystral-kk)
 - Use a more efficient implementation of Story::hasContent (bug #0000858, patch
diff -r 23beb1e0bbb1 -r ee900b120ca7 sql/updates/mssql_1.5.2_to_1.6.0.php
--- a/sql/updates/mssql_1.5.2_to_1.6.0.php	Mon Apr 13 18:08:11 2009 +0200
+++ b/sql/updates/mssql_1.5.2_to_1.6.0.php	Mon Apr 13 19:31:28 2009 +0200
@@ -74,6 +74,9 @@
     // change default for num_search_results
     $thirty = addslashes(serialize(30));
     DB_query("UPDATE {$_TABLES['conf_values']} SET value = '$thirty', default_value = '$thirty' WHERE name = 'num_search_results'");
+
+    // fix censormode dropdown
+    DB_query("UPDATE {$_TABLES['conf_values']} SET selectionArray = 18 WHERE name = 'censormode'");
 
     $c = config::get_instance();
 
diff -r 23beb1e0bbb1 -r ee900b120ca7 sql/updates/mysql_1.5.2_to_1.6.0.php
--- a/sql/updates/mysql_1.5.2_to_1.6.0.php	Mon Apr 13 18:08:11 2009 +0200
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php	Mon Apr 13 19:31:28 2009 +0200
@@ -73,6 +73,9 @@
     // change default for num_search_results
     $thirty = addslashes(serialize(30));
     DB_query("UPDATE {$_TABLES['conf_values']} SET value = '$thirty', default_value = '$thirty' WHERE name = 'num_search_results'");
+
+    // fix censormode dropdown
+    DB_query("UPDATE {$_TABLES['conf_values']} SET selectionArray = 18 WHERE name = 'censormode'");
 
     $c = config::get_instance();