php-blog-cvs Mailing List for Serendipity PHP Weblog System (Page 527)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv23845

Modified Files:
	serendipity_config.inc.php NEWS serendipity_sidebar_items.php 
	serendipity_lang_en.inc.php serendipity_lang_de.inc.php 
Log Message:
Now allows hTML-Nugget to be configured to not rewrite text. As the
automatic replacement of '*' and '/' words creates some issues by
paste/copying real HTML-text inside a nugget, and to individually disable
exit-tracking inside nuggets.

Bumped version number to 0.5-CVS


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43

--- serendipity_config.inc.php	5 Dec 2003 19:13:06 -0000	1.42
+++ serendipity_config.inc.php	23 Dec 2003 08:48:21 -0000	1.43
@@ -9,7 +9,7 @@
 include_once('compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']    = '0.4-CVS';
+$serendipity['version']    = '0.5-CVS';
 $serendipity['production'] = 1;
 $serendipity['rewrite']    = true;
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- NEWS	14 Nov 2003 12:27:25 -0000	1.37
+++ NEWS	23 Dec 2003 08:48:21 -0000	1.38
@@ -1,6 +1,10 @@
 # $Id$
 
-Version 0.4 ()
+Version 0.5 ()
+------------------------------------
+    * HTML-Nugget can now be configured to preserve textformatting. Default is 'apply textformatting' to stay backwards-compatible.
+
+Version 0.4 (December 12th, 2003)
 ------------------------------------
     * RSS2.0-feed now contains wfw:comments link for per-entry comments. Is interpreted by SharpReader i.e.
     * XHTML1 compatibility fixes, missing <tr> from the calendar fixed. Thanks to casper/jedijab79 from the forums (garvinhicking)

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_sidebar_items.php	11 Nov 2003 16:17:05 -0000	1.32
+++ serendipity_sidebar_items.php	23 Dec 2003 08:48:21 -0000	1.33
@@ -375,6 +375,7 @@
         $propbag->add('configuration', array(
                                         'title',
                                         'content',
+                                        'markup',
                                        )
         );
     }
@@ -393,6 +394,12 @@
                 $propbag->add('name',        CONTENT);
                 $propbag->add('description', THE_NUGGET);
                 break;
+            
+            case 'markup':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        NO_MARKUP);
+                $propbag->add('description', NO_MARKUP_DESCRIPTION);
+                break;
 
             default:
                 return false;
@@ -403,7 +410,11 @@
     function generate_content(&$title)
     {
         $title = $this->get_config('title', $title);
-        echo serendipity_markup_text($this->get_config('content'));
+        if ($this->get_config('markup') == 'true') {
+            echo $this->get_config('content');
+        } else {
+            echo serendipity_markup_text($this->get_config('content'));
+        }
     }
 }
 

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_lang_en.inc.php	11 Nov 2003 15:38:43 -0000	1.45
+++ serendipity_lang_en.inc.php	23 Dec 2003 08:48:21 -0000	1.46
@@ -296,5 +296,7 @@
 @define('PREVIOUS_PAGE', 'previous page');
 @define('NEXT_PAGE', 'next page');
 @define('ALL_CATEGORIES', 'All categories');
+@define('NO_MARKUP', 'No markup transformations');
+@define('NO_MARKUP_DESCRIPTION', 'Do not apply any markup transformations to this text (like smilies, shortcut markups via *, /, _, ...). This will preserve any HTML-code you have typed');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_de.inc.php	11 Nov 2003 15:38:45 -0000	1.35
+++ serendipity_lang_de.inc.php	23 Dec 2003 08:48:21 -0000	1.36
@@ -141,7 +141,7 @@
 @define('ADVERTISES_BLAHBLAH', 'Zeigt einen Hinweis, dass Serendipity die Blog Software ist');
 @define('HTML_NUGGET', 'HTML Klotz');
 @define('HOLDS_A_BLAHBLAH', 'Zeigt einen kleinen Klotz HTML Code in einer der Seitenleisten an');
-@define('TITLE_FOR_NUGGET', 'Titel f&uuml;r den Klotz');
+@define('TITLE_FOR_NUGGET', 'Titel für den Klotz');
 @define('THE_NUGGET', 'Der HTML Klotz!');
 @define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog');
 @define('QUICKJUMP', 'Schnellauswahl');
@@ -297,6 +297,8 @@
 @define('PREVIOUS_PAGE', 'vorige Seite');
 @define('NEXT_PAGE', 'nächste Seite');
 @define('ALL_CATEGORIES', 'Alle Kategorien');
+@define('NO_MARKUP', 'Keine Änderung der Textformatierung');
+@define('NO_MARKUP_DESCRIPTION', 'Keine Textformatierung durchführen, wie z.B. Smilies, Schnellformatierung via *, /, _, ...). Dadurch wird jeglicher eingegebener HTML-Code beibehalten.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>






2003	Jan	Feb	Mar (179)	Apr (56)	May (53)	Jun (65)	Jul (70)	Aug (89)	Sep (50)	Oct (38)	Nov (12)	Dec (12)
2004	Jan (57)	Feb (226)	Mar (172)	Apr (194)	May (120)	Jun (162)	Jul (297)	Aug (156)	Sep (312)	Oct (180)	Nov (358)	Dec (362)
2005	Jan (275)	Feb (224)	Mar (202)	Apr (157)	May (133)	Jun (115)	Jul (211)	Aug (257)	Sep (135)	Oct (116)	Nov (106)	Dec (81)
2006	Jan (74)	Feb (94)	Mar (59)	Apr (125)	May (50)	Jun (71)	Jul (45)	Aug (80)	Sep (3)	Oct (44)	Nov (50)	Dec (38)
2007	Jan (46)	Feb (33)	Mar (24)	Apr (28)	May (19)	Jun (37)	Jul (66)	Aug (73)	Sep (87)	Oct (33)	Nov (39)	Dec (37)
2008	Jan (20)	Feb (54)	Mar (47)	Apr (68)	May (10)	Jun (13)	Jul (13)	Aug (25)	Sep (11)	Oct (22)	Nov (22)	Dec (34)
2009	Jan (34)	Feb (35)	Mar (11)	Apr (10)	May (15)	Jun (18)	Jul (28)	Aug (22)	Sep (9)	Oct (12)	Nov (6)	Dec (32)
2010	Jan (11)	Feb (7)	Mar (9)	Apr (3)	May (16)	Jun (1)	Jul (2)	Aug (25)	Sep (9)	Oct (8)	Nov (4)	Dec (8)
2011	Jan (17)	Feb (1)	Mar (6)	Apr (7)	May (5)	Jun (2)	Jul (12)	Aug (3)	Sep (18)	Oct (3)	Nov (2)	Dec
2012	Jan (92)	Feb (74)	Mar (64)	Apr (55)	May (44)	Jun (91)	Jul (35)	Aug (42)	Sep (32)	Oct (56)	Nov (42)	Dec (81)
2013	Jan (117)	Feb (130)	Mar (33)	Apr (36)	May (155)	Jun (241)	Jul (113)	Aug (70)	Sep (50)	Oct (55)	Nov (34)	Dec (36)
2014	Jan (94)	Feb (67)	Mar (177)	Apr (67)	May (147)	Jun (137)	Jul (58)	Aug (56)	Sep (62)	Oct (35)	Nov (118)	Dec (53)
2015	Jan (204)	Feb (165)	Mar (275)	Apr (42)	May (58)	Jun (91)	Jul (81)	Aug (62)	Sep (23)	Oct (63)	Nov (29)	Dec (110)
2016	Jan (82)	Feb (55)	Mar (48)	Apr (92)	May (77)	Jun (41)	Jul (27)	Aug (41)	Sep (101)	Oct (84)	Nov (12)	Dec (18)
2017	Jan (44)	Feb (40)	Mar (23)	Apr (79)	May (27)	Jun (12)	Jul (20)	Aug (14)	Sep (3)	Oct (9)	Nov (4)	Dec (9)
2018	Jan (5)	Feb (23)	Mar (150)	Apr (114)	May (63)	Jun (25)	Jul (23)	Aug (54)	Sep (43)	Oct (10)	Nov (9)	Dec (1)
2019	Jan (1)	Feb (27)	Mar (27)	Apr (64)	May (21)	Jun (17)	Jul (12)	Aug (81)	Sep (15)	Oct (25)	Nov (15)	Dec (13)
2020	Jan (5)	Feb (4)	Mar (95)	Apr (59)	May (53)	Jun (22)	Jul (3)	Aug (13)	Sep (10)	Oct (4)	Nov (3)	Dec (1)
2021	Jan (20)	Feb (32)	Mar (34)	Apr (22)	May (58)	Jun (43)	Jul (35)	Aug (2)	Sep (14)	Oct (1)	Nov (2)	Dec
2022	Jan (2)	Feb (6)	Mar (4)	Apr	May (5)	Jun (4)	Jul (3)	Aug (5)	Sep (6)	Oct (3)	Nov (38)	Dec (15)
2023	Jan (26)	Feb (12)	Mar (3)	Apr (9)	May (2)	Jun (5)	Jul (8)	Aug	Sep (39)	Oct (11)	Nov (3)	Dec (3)
2024	Jan (19)	Feb (20)	Mar (15)	Apr (12)	May (2)	Jun (12)	Jul (4)	Aug (9)	Sep	Oct	Nov	Dec
2025	Jan (72)	Feb (80)	Mar (92)	Apr (35)	May (19)	Jun (14)	Jul	Aug	Sep	Oct	Nov	Dec

php-blog-cvs Mailing List for Serendipity PHP Weblog System (Page 527)

A reliable, secure & extensible PHP blog | Not mainstream since 2002

php-blog-cvs — Serendipity commit list