From: shizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Date: Sun, 6 Sep 2009 03:50:24 +0000 (+0000)
Subject: FIX: version number given in welcome post
X-Git-Tag: release-3-50~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=82bbdee2ebc5f80f1f40a3434852a431f2c0a9e9;p=nucleus-jp%2Fnucleus-jp-ancient.git

FIX: version number given in welcome post
FIX: strange bug where number 3 appended to all plugin names in Plugin Options lists.
ADD: Comment template variable userwebsitelink which acts like userlink, but only shows web address and never email.
Change version number to version 3.50-RC-2


git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1051 1ca29b6e-896d-4ea0-84a5-967f57386b96
---

diff --git a/utf8/nucleus/documentation/help.html b/utf8/nucleus/documentation/help.html
index b88b77a..3d0e2d4 100644
--- a/utf8/nucleus/documentation/help.html
+++ b/utf8/nucleus/documentation/help.html
@@ -4562,6 +4562,9 @@ Webページ出力時に、指定されたスペシャルスキンもしくは
     <td>userwebsite</td>
     <td>ユーザーのwebsiteのURL。もしコメント者によって入力されていない場合は空</td>
 </tr><tr>
+	<td>userwebsitelink</td>
+    <td>コメント者が登録メンバーの時はメンバー詳細ページに、それ以外の時は入力されたWebサイトのURLに対する&lt;a href="..."&gt;タグ付きのリンク（有効なURLが入力されていない場合は、コメント者の名前のみが表示されます）</td>
+</tr><tr>
     <td>memberid</td>
     <td>メンバーのID（コメント者がログイン中の登録メンバーでない時は0になります）</td>
 </tr><tr>
diff --git a/utf8/nucleus/documentation/history.html b/utf8/nucleus/documentation/history.html
index 89b610d..d54c9a0 100755
--- a/utf8/nucleus/documentation/history.html
+++ b/utf8/nucleus/documentation/history.html
@@ -57,6 +57,7 @@
     <li>
         <strong>Nucleus v3.5 (SVN)</strong>
         <ul>
+			<li>ADD: Comment template variable userwebsitelink which acts like userlink, but only shows web address and never email. (ftruscot)</li>
             <li>ADD: 2 Category List template variables, catiscurrent and its synonym, currentcat. (ftruscot)</li>
             <li>ADD: code to warn if using a non-mysql database handler and a plugin does not supportsFeature 'SqlApi'. (ftruscot)</li>
             <li>CHANGE: set php setting, display_errors, to 0 when not in debug mode to keep users with poorly configured servers from displaying errors on the page. (ftruscot)</li>
diff --git a/utf8/nucleus/libs/ADMIN.php b/utf8/nucleus/libs/ADMIN.php
index 3e86c89..6ce0218 100755
--- a/utf8/nucleus/libs/ADMIN.php
+++ b/utf8/nucleus/libs/ADMIN.php
@@ -6433,7 +6433,7 @@ selector();
 
 
 
-                echo '<tr><th colspan="2">'.sprintf(_PLUGIN_OPTIONS_TITLE, htmlspecialchars($aOption['pfile']. ENT_QUOTES)).'</th></tr>';
+                echo '<tr><th colspan="2">'.sprintf(_PLUGIN_OPTIONS_TITLE, htmlspecialchars($aOption['pfile'], ENT_QUOTES)).'</th></tr>';
             }
 
             $meta = NucleusPlugin::getOptionMeta($aOption['typeinfo']);
diff --git a/utf8/nucleus/libs/COMMENTACTIONS.php b/utf8/nucleus/libs/COMMENTACTIONS.php
index 2344a1b..6116403 100644
--- a/utf8/nucleus/libs/COMMENTACTIONS.php
+++ b/utf8/nucleus/libs/COMMENTACTIONS.php
@@ -17,378 +17,390 @@
  * @version $Id$
  * @version $NucleusJP: COMMENTACTIONS.php,v 1.5.2.1 2007/08/08 05:31:31 kimitake Exp $
  */
-
-class COMMENTACTIONS extends BaseActions {
-
-	// ref to COMMENTS object which is using this object to handle
-	// its templatevars
-	var $commentsObj;
-
-	// template to use to parse the comments
-	var $template;
-
-	// comment currenlty being handled (mysql result assoc array; see COMMENTS::showComments())
-	var $currentComment;
-
-	function COMMENTACTIONS(&$comments) {
-		// call constructor of superclass first
-		$this->BaseActions();
-
-		// reference to the comments object
-		$this->setCommentsObj($comments);
-	}
-
-	function getDefinedActions() {
-		return array(
-			'blogurl',
-			'commentcount',
-			'commentword',
-			'email',
-			'itemlink',
-			'itemid',
-			'itemtitle',
-			'date',
-			'time',
-			'commentid',
-			'body',
-			'memberid',
-			'timestamp',
-			'host',
-			'ip',
-			'blogid',
-			'authtext',
-			'user',
-			'userid',
-			'userlinkraw',
-			'userlink',
-			'useremail',
-			'userwebsite',
-			'excerpt',
-			'short',
-			'skinfile',
-			'set',
-			'plugin',
-			'include',
-			'phpinclude',
-			'parsedinclude'
-		);
-	}
-
-	function setParser(&$parser) {
-		$this->parser =& $parser;
-	}
-	
-	function setCommentsObj(&$commentsObj) {
-		$this->commentsObj =& $commentsObj;
-	}
-	
-	function setTemplate($template) {
-		$this->template =& $template;
-	}
-	
-	function setCurrentComment(&$comment) {
-		global $manager;
-		if ($comment['memberid'] != 0) {
-			$comment['authtext'] = $template['COMMENTS_AUTH'];
-
-			$mem =& $manager->getMember($comment['memberid']);
-			$comment['user'] = $mem->getDisplayName();
-			if ($mem->getURL())
-				$comment['userid'] = $mem->getURL();
-			else
-				$comment['userid'] = $mem->getEmail();
-
-			$comment['userlinkraw'] = createLink(
-										'member',
-										array(
-											'memberid' => $comment['memberid'],
-											'name' => $mem->getDisplayName(),
-											'extra' => $this->commentsObj->itemActions->linkparams
-										)
-									  );
-
-		} else {
-
-			// create smart links
-/*			if (isValidMailAddress($comment['userid']))
-				$comment['userlinkraw'] = 'mailto:'.$comment['userid'];
-			elseif (strstr($comment['userid'],'http://') != false)
-				$comment['userlinkraw'] = $comment['userid'];
-			elseif (strstr($comment['userid'],'www') != false)
-				$comment['userlinkraw'] = 'http://'.$comment['userid'];*/
-			if (strstr($comment['userid'],'http://') != false)
-				$comment['userlinkraw'] = $comment['userid'];
-			elseif (strstr($comment['userid'],'www') != false)
-				$comment['userlinkraw'] = 'http://'.$comment['userid'];
-			elseif (isValidMailAddress($comment['email']))
-				$comment['userlinkraw'] = 'mailto:'.$comment['email'];
-			elseif (isValidMailAddress($comment['userid']))
-				$comment['userlinkraw'] = 'mailto:'.$comment['userid'];
-		}
-
-		$this->currentComment =& $comment;
-	}
-
-	/**
-	 * Parse templatevar authtext
-	 */
-	function parse_authtext() {
-		if ($this->currentComment['memberid'] != 0)
-			$this->parser->parse($this->template['COMMENTS_AUTH']);
-	}
-
-	/**
-	 * Parse templatevar blogid
-	 */
-	function parse_blogid() {
-		echo $this->currentComment['blogid'];
-	}
-
-	/**
-	 * Parse templatevar blogurl
-	 */
-	function parse_blogurl() {
-		global $manager;
-		$blogid = getBlogIDFromItemID($this->commentsObj->itemid);
-		$blog =& $manager->getBlog($blogid);
-		echo $blog->getURL();
-	}
-
-	/**
-	 * Parse templatevar body
-	 */
-	function parse_body() {
-		echo $this->highlight($this->currentComment['body']);
-	}
-
-	/**
-	 * Parse templatevar commentcount
-	 */
-	function parse_commentcount() {
-			echo $this->commentsObj->commentcount;
-	}
-
-	/**
-	 * Parse templatevar commentid
-	 */
-	function parse_commentid() {
-		echo $this->currentComment['commentid'];
-	}
-
-	/**
-	 * Parse templatevar commentword
-	 */
-	function parse_commentword() {
-		if ($this->commentsObj->commentcount == 1)
-			echo $this->template['COMMENTS_ONE'];
-		else
-			echo $this->template['COMMENTS_MANY'];
-	}
-
-	/**
-	 * Parse templatevar date
-	 */
-	function parse_date($format = '') {
-		echo formatDate($format, $this->currentComment['timestamp'], $this->template['FORMAT_DATE'], $this->commentsObj->itemActions->blog);
-	}
-	
-	/**
-	 * Parse templatevar email
-	 */
-	function parse_email() {
-		$email = $this->currentComment['email'];
-		$email = str_replace('@', ' (at) ', $email);
-		$email = str_replace('.', ' (dot) ', $email);
-		echo $email;
-	}
-
-	/**
-	 * Parse templatevar excerpt
-	 */
-	function parse_excerpt() {
-		echo stringToXML(shorten($this->currentComment['body'], 60, '...'));
-	}
-
-	/**
-	 * Parse templatevar host
-	 */
-	function parse_host() {
-		echo $this->currentComment['host'];
-	}
-
-	/**
-	 * Parse templatevar ip
-	 */
-	function parse_ip() {
-		echo $this->currentComment['ip'];
-	}
-
-	/**
-	 * Parse templatevar itemid
-	 */
-	function parse_itemid() {
-		echo $this->commentsObj->itemid;
-	}
-
-	/**
-	 * Parse templatevar itemlink
-	 */
-	function parse_itemlink() {
-		echo createLink(
-			'item',
-			array(
-				'itemid' => $this->commentsObj->itemid,
-				'timestamp' => $this->commentsObj->itemActions->currentItem->timestamp,
-				'title' => $this->commentsObj->itemActions->currentItem->title,
-				'extra' => $this->commentsObj->itemActions->linkparams
-			)
-		);
-	}
-
-	/**
-	 * Parse templatevar itemtitle
-	 */
-	function parse_itemtitle($maxLength = 0) {
-		if ($maxLength == 0)
-			$this->commentsObj->itemActions->parse_title();
-		else
-			$this->commentsObj->itemActions->parse_syndicate_title($maxLength);
-	}
-
-	/**
-	 * Parse templatevar memberid
-	 */
-	function parse_memberid() {
-		echo $this->currentComment['memberid'];
-	}
-
-	/**
-	 * Parse templatevar short
-	 */
-	function parse_short() {
-		$tmp = strtok($this->currentComment['body'],"\n");
-		$tmp = str_replace('<br />','',$tmp);
-		echo $tmp;
-		if ($tmp != $this->currentComment['body'])
-			$this->parser->parse($this->template['COMMENTS_CONTINUED']);
-	}
-
-	/**
-	 * Parse templatevar time
-	 */
-	function parse_time($format = '') {
-		echo strftime(
-				($format == '') ? $this->template['FORMAT_TIME'] : $format,
-				$this->currentComment['timestamp']
-			);
-	}
-
-	/**
-	 * Parse templatevar timestamp
-	 */
-	function parse_timestamp() {
-		echo $this->currentComment['timestamp'];
-	}
-
-	/**
-	  * Executes a plugin templatevar
-	  *
-	  * @param pluginName name of plugin (without the NP_)
-	  *
-	  * extra parameters can be added
-	  */
-	function parse_plugin($pluginName) {
-		global $manager;
-
-		// only continue when the plugin is really installed
-		if (!$manager->pluginInstalled('NP_' . $pluginName))
-			return;
-
-		$plugin =& $manager->getPlugin('NP_' . $pluginName);
-		if (!$plugin) return;
-
-		// get arguments
-		$params = func_get_args();
-
-		// remove plugin name
-		array_shift($params);
-
-		// pass info on current item and current comment as well
-		$params = array_merge(array(&$this->currentComment),$params);
-		$params = array_merge(array(&$this->commentsObj->itemActions->currentItem),$params);
-
-		call_user_func_array(array(&$plugin,'doTemplateCommentsVar'), $params);
-	}
-
-	/**
-	 * Parse templatevar user
-	 */
-	function parse_user($mode='') {
-		global $manager;
-		if ($mode == 'realname' && $this->currentComment['memberid'] > 0) {
-			$member =& $manager->getMember($this->currentComment['memberid']);
-			echo $member->getRealName();
-		} else {
-			echo $this->currentComment['user'];
-		}
-	}
-
-	/**
-	 * Parse templatevar useremail
-	 */
-	function parse_useremail() {
-		global $manager;
-		if ($this->currentComment['memberid'] > 0)
-		{
-			$member =& $manager->getMember($this->currentComment['memberid']);
-
-			if ($member->email != '')
-				echo $member->email;
-		}
-		else
-		{
-			if (isValidMailAddress($this->currentComment['email']))
-				echo $this->currentComment['email'];
-			elseif (isValidMailAddress($this->currentComment['userid']))
-				echo $this->currentComment['userid'];
-//			if (!(strpos($this->currentComment['userlinkraw'], 'mailto:') === false))
-//				echo str_replace('mailto:', '', $this->currentComment['userlinkraw']);
-		}
-	}
-
-	/**
-	 * Parse templatevar userid
-	 */
-	function parse_userid() {
-			echo $this->currentComment['userid'];
-	}
-
-
-	/**
-	 * Parse templatevar userlink
-	 */
-	function parse_userlink() {
-		if ($this->currentComment['userlinkraw']) {
-			echo '<a href="'.$this->currentComment['userlinkraw'].'" rel="nofollow">'.$this->currentComment['user'].'</a>';
-		} else {
-			echo $this->currentComment['user'];
-		}
-	}
-
-	/**
-	 * Parse templatevar userlinkraw
-	 */
-	function parse_userlinkraw() {
-		echo $this->currentComment['userlinkraw'];
-	}
-	
-	/**
-	 * Parse templatevar userwebsite
-	 */
-	function parse_userwebsite() {
-		if (!(strpos($this->currentComment['userlinkraw'], 'http://') === false))
-			echo $this->currentComment['userlinkraw'];
-	}
-
-}
+
+class COMMENTACTIONS extends BaseActions {
+
+	// ref to COMMENTS object which is using this object to handle
+	// its templatevars
+	var $commentsObj;
+
+	// template to use to parse the comments
+	var $template;
+
+	// comment currenlty being handled (mysql result assoc array; see COMMENTS::showComments())
+	var $currentComment;
+
+	function COMMENTACTIONS(&$comments) {
+		// call constructor of superclass first
+		$this->BaseActions();
+
+		// reference to the comments object
+		$this->setCommentsObj($comments);
+	}
+
+	function getDefinedActions() {
+		return array(
+			'blogurl',
+			'commentcount',
+			'commentword',
+			'email',
+			'itemlink',
+			'itemid',
+			'itemtitle',
+			'date',
+			'time',
+			'commentid',
+			'body',
+			'memberid',
+			'timestamp',
+			'host',
+			'ip',
+			'blogid',
+			'authtext',
+			'user',
+			'userid',
+			'userlinkraw',
+			'userlink',
+			'useremail',
+			'userwebsite',
+			'userwebsitelink',
+			'excerpt',
+			'short',
+			'skinfile',
+			'set',
+			'plugin',
+			'include',
+			'phpinclude',
+			'parsedinclude'
+		);
+	}
+
+	function setParser(&$parser) {
+		$this->parser =& $parser;
+	}
+	
+	function setCommentsObj(&$commentsObj) {
+		$this->commentsObj =& $commentsObj;
+	}
+	
+	function setTemplate($template) {
+		$this->template =& $template;
+	}
+	
+	function setCurrentComment(&$comment) {
+		global $manager;
+		if ($comment['memberid'] != 0) {
+			$comment['authtext'] = $template['COMMENTS_AUTH'];
+
+			$mem =& $manager->getMember($comment['memberid']);
+			$comment['user'] = $mem->getDisplayName();
+			if ($mem->getURL())
+				$comment['userid'] = $mem->getURL();
+			else
+				$comment['userid'] = $mem->getEmail();
+
+			$comment['userlinkraw'] = createLink(
+										'member',
+										array(
+											'memberid' => $comment['memberid'],
+											'name' => $mem->getDisplayName(),
+											'extra' => $this->commentsObj->itemActions->linkparams
+										)
+									  );
+
+		} else {
+
+			// create smart links
+/*			if (isValidMailAddress($comment['userid']))
+				$comment['userlinkraw'] = 'mailto:'.$comment['userid'];
+			elseif (strstr($comment['userid'],'http://') != false)
+				$comment['userlinkraw'] = $comment['userid'];
+			elseif (strstr($comment['userid'],'www') != false)
+				$comment['userlinkraw'] = 'http://'.$comment['userid'];*/
+			if (strstr($comment['userid'],'http://') != false)
+				$comment['userlinkraw'] = $comment['userid'];
+			elseif (strstr($comment['userid'],'www') != false)
+				$comment['userlinkraw'] = 'http://'.$comment['userid'];
+			elseif (isValidMailAddress($comment['email']))
+				$comment['userlinkraw'] = 'mailto:'.$comment['email'];
+			elseif (isValidMailAddress($comment['userid']))
+				$comment['userlinkraw'] = 'mailto:'.$comment['userid'];
+		}
+
+		$this->currentComment =& $comment;
+	}
+
+	/**
+	 * Parse templatevar authtext
+	 */
+	function parse_authtext() {
+		if ($this->currentComment['memberid'] != 0)
+			$this->parser->parse($this->template['COMMENTS_AUTH']);
+	}
+
+	/**
+	 * Parse templatevar blogid
+	 */
+	function parse_blogid() {
+		echo $this->currentComment['blogid'];
+	}
+
+	/**
+	 * Parse templatevar blogurl
+	 */
+	function parse_blogurl() {
+		global $manager;
+		$blogid = getBlogIDFromItemID($this->commentsObj->itemid);
+		$blog =& $manager->getBlog($blogid);
+		echo $blog->getURL();
+	}
+
+	/**
+	 * Parse templatevar body
+	 */
+	function parse_body() {
+		echo $this->highlight($this->currentComment['body']);
+	}
+
+	/**
+	 * Parse templatevar commentcount
+	 */
+	function parse_commentcount() {
+			echo $this->commentsObj->commentcount;
+	}
+
+	/**
+	 * Parse templatevar commentid
+	 */
+	function parse_commentid() {
+		echo $this->currentComment['commentid'];
+	}
+
+	/**
+	 * Parse templatevar commentword
+	 */
+	function parse_commentword() {
+		if ($this->commentsObj->commentcount == 1)
+			echo $this->template['COMMENTS_ONE'];
+		else
+			echo $this->template['COMMENTS_MANY'];
+	}
+
+	/**
+	 * Parse templatevar date
+	 */
+	function parse_date($format = '') {
+		echo formatDate($format, $this->currentComment['timestamp'], $this->template['FORMAT_DATE'], $this->commentsObj->itemActions->blog);
+	}
+	
+	/**
+	 * Parse templatevar email
+	 */
+	function parse_email() {
+		$email = $this->currentComment['email'];
+		$email = str_replace('@', ' (at) ', $email);
+		$email = str_replace('.', ' (dot) ', $email);
+		echo $email;
+	}
+
+	/**
+	 * Parse templatevar excerpt
+	 */
+	function parse_excerpt() {
+		echo stringToXML(shorten($this->currentComment['body'], 60, '...'));
+	}
+
+	/**
+	 * Parse templatevar host
+	 */
+	function parse_host() {
+		echo $this->currentComment['host'];
+	}
+
+	/**
+	 * Parse templatevar ip
+	 */
+	function parse_ip() {
+		echo $this->currentComment['ip'];
+	}
+
+	/**
+	 * Parse templatevar itemid
+	 */
+	function parse_itemid() {
+		echo $this->commentsObj->itemid;
+	}
+
+	/**
+	 * Parse templatevar itemlink
+	 */
+	function parse_itemlink() {
+		echo createLink(
+			'item',
+			array(
+				'itemid' => $this->commentsObj->itemid,
+				'timestamp' => $this->commentsObj->itemActions->currentItem->timestamp,
+				'title' => $this->commentsObj->itemActions->currentItem->title,
+				'extra' => $this->commentsObj->itemActions->linkparams
+			)
+		);
+	}
+
+	/**
+	 * Parse templatevar itemtitle
+	 */
+	function parse_itemtitle($maxLength = 0) {
+		if ($maxLength == 0)
+			$this->commentsObj->itemActions->parse_title();
+		else
+			$this->commentsObj->itemActions->parse_syndicate_title($maxLength);
+	}
+
+	/**
+	 * Parse templatevar memberid
+	 */
+	function parse_memberid() {
+		echo $this->currentComment['memberid'];
+	}
+
+	/**
+	 * Parse templatevar short
+	 */
+	function parse_short() {
+		$tmp = strtok($this->currentComment['body'],"\n");
+		$tmp = str_replace('<br />','',$tmp);
+		echo $tmp;
+		if ($tmp != $this->currentComment['body'])
+			$this->parser->parse($this->template['COMMENTS_CONTINUED']);
+	}
+
+	/**
+	 * Parse templatevar time
+	 */
+	function parse_time($format = '') {
+		echo strftime(
+				($format == '') ? $this->template['FORMAT_TIME'] : $format,
+				$this->currentComment['timestamp']
+			);
+	}
+
+	/**
+	 * Parse templatevar timestamp
+	 */
+	function parse_timestamp() {
+		echo $this->currentComment['timestamp'];
+	}
+
+	/**
+	  * Executes a plugin templatevar
+	  *
+	  * @param pluginName name of plugin (without the NP_)
+	  *
+	  * extra parameters can be added
+	  */
+	function parse_plugin($pluginName) {
+		global $manager;
+
+		// only continue when the plugin is really installed
+		if (!$manager->pluginInstalled('NP_' . $pluginName))
+			return;
+
+		$plugin =& $manager->getPlugin('NP_' . $pluginName);
+		if (!$plugin) return;
+
+		// get arguments
+		$params = func_get_args();
+
+		// remove plugin name
+		array_shift($params);
+
+		// pass info on current item and current comment as well
+		$params = array_merge(array(&$this->currentComment),$params);
+		$params = array_merge(array(&$this->commentsObj->itemActions->currentItem),$params);
+
+		call_user_func_array(array(&$plugin,'doTemplateCommentsVar'), $params);
+	}
+
+	/**
+	 * Parse templatevar user
+	 */
+	function parse_user($mode='') {
+		global $manager;
+		if ($mode == 'realname' && $this->currentComment['memberid'] > 0) {
+			$member =& $manager->getMember($this->currentComment['memberid']);
+			echo $member->getRealName();
+		} else {
+			echo $this->currentComment['user'];
+		}
+	}
+
+	/**
+	 * Parse templatevar useremail
+	 */
+	function parse_useremail() {
+		global $manager;
+		if ($this->currentComment['memberid'] > 0)
+		{
+			$member =& $manager->getMember($this->currentComment['memberid']);
+
+			if ($member->email != '')
+				echo $member->email;
+		}
+		else
+		{
+			if (isValidMailAddress($this->currentComment['email']))
+				echo $this->currentComment['email'];
+			elseif (isValidMailAddress($this->currentComment['userid']))
+				echo $this->currentComment['userid'];
+//			if (!(strpos($this->currentComment['userlinkraw'], 'mailto:') === false))
+//				echo str_replace('mailto:', '', $this->currentComment['userlinkraw']);
+		}
+	}
+
+	/**
+	 * Parse templatevar userid
+	 */
+	function parse_userid() {
+			echo $this->currentComment['userid'];
+	}
+
+
+	/**
+	 * Parse templatevar userlink
+	 */
+	function parse_userlink() {
+		if ($this->currentComment['userlinkraw']) {
+			echo '<a href="'.$this->currentComment['userlinkraw'].'" rel="nofollow">'.$this->currentComment['user'].'</a>';
+		} else {
+			echo $this->currentComment['user'];
+		}
+	}
+
+	/**
+	 * Parse templatevar userlinkraw
+	 */
+	function parse_userlinkraw() {
+		echo $this->currentComment['userlinkraw'];
+	}
+	
+	/**
+	 * Parse templatevar userwebsite
+	 */
+	function parse_userwebsite() {
+		if (!(strpos($this->currentComment['userlinkraw'], 'http://') === false))
+			echo $this->currentComment['userlinkraw'];
+	}
+	
+	/**
+	 * Parse templatevar userwebsitelink
+	 */
+	function parse_userwebsitelink() {
+		if (!(strpos($this->currentComment['userlinkraw'], 'http://') === false)) {
+			echo '<a href="'.$this->currentComment['userlinkraw'].'" rel="nofollow">'.$this->currentComment['user'].'</a>';
+		} else {
+			echo $this->currentComment['user'];
+		}
+	}
+
+}
 ?>
\ No newline at end of file
diff --git a/utf8/nucleus/libs/SKIN.php b/utf8/nucleus/libs/SKIN.php
index fc1d2ae..1d92f82 100755
--- a/utf8/nucleus/libs/SKIN.php
+++ b/utf8/nucleus/libs/SKIN.php
@@ -152,9 +152,10 @@ class SKIN {
 	}
 
 	function parse($type) {
-		global $manager, $CONF;
+		global $manager, $CONF, $skinid;
 
 		$manager->notify('InitSkinParse',array('skin' => &$this, 'type' => $type));
+        $skinid = $this->id;
 
 		// set output type
 		sendContentType($this->getContentType(), 'skin', _CHARSET);
@@ -178,6 +179,7 @@ class SKIN {
 		$actions = $this->getAllowedActionsForType($type);
 
 		$manager->notify('PreSkinParse',array('skin' => &$this, 'type' => $type, 'contents' => &$contents));
+        $skinid = $this->id;
 
 		// set IncludeMode properties of parser
 		PARSER::setProperty('IncludeMode',$this->getIncludeMode());
@@ -190,6 +192,7 @@ class SKIN {
 		$parser->parse($contents);
 
 		$manager->notify('PostSkinParse',array('skin' => &$this, 'type' => $type));
+        $skinid = $this->id;
 
 
 	}
diff --git a/utf8/nucleus/libs/globalfunctions.php b/utf8/nucleus/libs/globalfunctions.php
index 2ce6031..d0f27aa 100755
--- a/utf8/nucleus/libs/globalfunctions.php
+++ b/utf8/nucleus/libs/globalfunctions.php
@@ -20,7 +20,7 @@
 // needed if we include globalfunctions from install.php
 global $nucleus, $CONF, $DIR_LIBS, $DIR_LANG, $manager, $member;
 
-$nucleus['version'] = 'v3.50SVN';
+$nucleus['version'] = 'v3.50-RC-2';
 $nucleus['codename'] = '';
 
 checkVars(array('nucleus', 'CONF', 'DIR_LIBS', 'MYSQL_HOST', 'MYSQL_USER', 'MYSQL_PASSWORD', 'MYSQL_DATABASE', 'DIR_LANG', 'DIR_PLUGINS', 'HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_ENV_VARS', 'HTTP_SESSION_VARS', 'HTTP_POST_FILES', 'HTTP_SERVER_VARS', 'GLOBALS', 'argv', 'argc', '_GET', '_POST', '_COOKIE', '_ENV', '_SESSION', '_SERVER', '_FILES'));