[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.9,1.10

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

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22926/plugins/serendipity_event_emoticate

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
Use 'emoticons.inc.php' instead of an array inside layout.php, so that the
emoticons can be fetched template-wise from there in the RSS feed as well
(which didn't include layout.php).


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_emoticate.php	23 Aug 2004 18:15:58 -0000	1.9
+++ serendipity_event_emoticate.php	25 Aug 2004 08:58:19 -0000	1.10
@@ -49,22 +49,28 @@
             $conf_array[] = $element['name'];
         }
         $propbag->add('configuration', $conf_array);
-        
+
     }
 
     function getEmoticons() {
         global $serendipity;
 
-        /* Avoid multiple runs of serendipity_getTemplateFile(), 
+        /* Avoid multiple runs of serendipity_getTemplateFile(),
            in other words - if we already have a list of smilies, don't bother looking for another */
-        if ( sizeof($this->smilies) != 0 ) {
+        if (isset($this->smilies) && sizeof($this->smilies) != 0) {
             return $this->smilies;
         }
 
         /* Hijack global variable $serendipity['custom_emoticons'] if it exists */
-        if ( isset($serendipity['custom_emoticons']) && is_array($serendipity['custom_emoticons']) ) {
-            $this->smilies = $serendipity['custom_emoticons'];
-        } else {
+        $hijack_file = serendipity_getTemplateFile('emoticons.inc.php', 'serendipityPath');
+        if (file_exists($hijack_file)) {
+            @include $hijack_file;
+            if (isset($serendipity['custom_emoticons']) && is_array($serendipity['custom_emoticons'])) {
+                $this->smilies = $serendipity['custom_emoticons'];
+            }
+        }
+
+        if (!isset($this->smilies)) {
             $this->smilies = array(
                 ":'("  => serendipity_getTemplateFile('img/emoticons/cry.png'),