[pLog-svn] r6849 - in plugins/branches/lifetype-1.2/smileys: . class/smileys

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2009-04-06 20:33:17 -0400 (Mon, 06 Apr 2009)
New Revision: 6849

Modified:
   plugins/branches/lifetype-1.2/smileys/class/smileys/smileys.class.php
   plugins/branches/lifetype-1.2/smileys/pluginsmileys.class.php
Log:
fix static issue in php version 5.2.8 and greater.  We need a lot of these fixes throughout all of our code

Modified: plugins/branches/lifetype-1.2/smileys/class/smileys/smileys.class.php
===================================================================
--- plugins/branches/lifetype-1.2/smileys/class/smileys/smileys.class.php	2009-04-04 19:25:18 UTC (rev 6848)
+++ plugins/branches/lifetype-1.2/smileys/class/smileys/smileys.class.php	2009-04-07 00:33:17 UTC (rev 6849)
@@ -73,7 +73,7 @@
 		 * @static
 		 * @return 
          */
-        function smileys( $blogInfo, $text, $setName, $smileySet )
+        function smileys_f( $blogInfo, $text, $setName, $smileySet )
         {
 			$rg = $blogInfo->getBlogRequestGenerator();
 			foreach( $smileySet as $smiley => $icon ) {

Modified: plugins/branches/lifetype-1.2/smileys/pluginsmileys.class.php
===================================================================
--- plugins/branches/lifetype-1.2/smileys/pluginsmileys.class.php	2009-04-04 19:25:18 UTC (rev 6848)
+++ plugins/branches/lifetype-1.2/smileys/pluginsmileys.class.php	2009-04-07 00:33:17 UTC (rev 6849)
@@ -75,9 +75,9 @@
 			
 			// modify the text...
 			$postIntroText = $post->getIntroText();
-			$postIntroText = Smileys::smileys( $this->blogInfo, $postIntroText, $smileySet, $smileys );
+			$postIntroText = Smileys::smileys_f( $this->blogInfo, $postIntroText, $smileySet, $smileys );
 			$postExtendedText = $post->getExtendedText();
-			$postExtendedText = Smileys::smileys( $this->blogInfo, $postExtendedText, $smileySet, $smileys );
+			$postExtendedText = Smileys::smileys_f( $this->blogInfo, $postExtendedText, $smileySet, $smileys );
 			$post->setText( $postIntroText.POST_EXTENDED_TEXT_MODIFIER.$postExtendedText );
 			// ...modify the comments...
 			$comments = $post->getComments();
@@ -90,7 +90,7 @@
 			$output = Array();
 			foreach( $comments as $comment ) {
 				$tmpText = $comment->getText();
-				$commentText = Smileys::smileys( $this->blogInfo, $tmpText, $smileySet, $smileys );
+				$commentText = Smileys::smileys_f( $this->blogInfo, $tmpText, $smileySet, $smileys );
 				$comment->setText( $commentText );
 				array_push( $output, $comment );
 			}