[php-blog-cvs] serendipity serendipity.inc.php,1.4,1.5 serendipity_config.inc.php,1.15,1.16

[<gar...@us...>]

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

Modified Files:
	serendipity.inc.php serendipity_config.inc.php 
Log Message:
Removed temporary smiley-outsircing in a file in favor of a latter removal
of serendipity.inc.php.


Index: serendipity.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity.inc.php	8 Jul 2003 09:13:27 -0000	1.4
+++ serendipity.inc.php	9 Jul 2003 07:53:17 -0000	1.5
@@ -20,7 +20,23 @@
 include_once('./serendipity_config_local.inc.php');
 
 // Put your emoticons here
-include_once('./serendipity_smiles.inc.php');
+$serendipity['smiles'] = array( ":'("  => $serendipity['serendipityHTTPPath'] . 'pixel/cry_smile.gif',
+                                ':-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/regular_smile.gif',
+                                ':-O'  => $serendipity['serendipityHTTPPath'] . 'pixel/embaressed_smile.gif',
+                                ':O'   => $serendipity['serendipityHTTPPath'] . 'pixel/embaressed_smile.gif',
+                                ':-('  => $serendipity['serendipityHTTPPath'] . 'pixel/sad_smile.gif',
+                                ':('   => $serendipity['serendipityHTTPPath'] . 'pixel/sad_smile.gif',
+                                ':)'   => $serendipity['serendipityHTTPPath'] . 'pixel/regular_smile.gif',
+                                '8-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/shades_smile.gif',
+                                ':-D'  => $serendipity['serendipityHTTPPath'] . 'pixel/teeth_smile.gif',
+                                ':D'   => $serendipity['serendipityHTTPPath'] . 'pixel/teeth_smile.gif',
+                                '8)'   => $serendipity['serendipityHTTPPath'] . 'pixel/shades_smile.gif',
+                                ':-P'  => $serendipity['serendipityHTTPPath'] . 'pixel/tounge_smile.gif',
+                                ';-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/wink_smile.gif',
+                                ';)'   => $serendipity['serendipityHTTPPath'] . 'pixel/wink_smile.gif',
+                                ':P'   => $serendipity['serendipityHTTPPath'] . 'pixel/tounge_smile.gif',
+);
+
 // You're done :)
 
 /*************************************************************************

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_config.inc.php	8 Jul 2003 09:13:27 -0000	1.15
+++ serendipity_config.inc.php	9 Jul 2003 07:53:17 -0000	1.16
@@ -52,8 +52,6 @@
 }
 
 // A Set of emoticons to rewrite
-include_once('./serendipity_smiles.inc.php');
-
 $serendipity['smiles'] = array( ":'("  => $serendipity['serendipityHTTPPath'] . 'pixel/cry_smile.gif',
                                 ':-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/regular_smile.gif',
                                 ':-O'  => $serendipity['serendipityHTTPPath'] . 'pixel/embaressed_smile.gif',
@@ -69,7 +67,7 @@
                                 ';-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/wink_smile.gif',
                                 ';)'   => $serendipity['serendipityHTTPPath'] . 'pixel/wink_smile.gif',
                                 ':P'   => $serendipity['serendipityHTTPPath'] . 'pixel/tounge_smile.gif',
-                              );
+);
 
 
 // Avoid magic_quotes_gpc issues