From e24e68c9f459f87aa88d35f990005f80c45b3045 Mon Sep 17 00:00:00 2001
From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Sat, 7 Apr 2012 23:06:34 +0900
Subject: [PATCH] =?utf8?q?typo=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

ENTITY::hsc()を修正。
---
 nucleus/libs/AdminActions.php | 44 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index d561b56..ef25184 100644
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1799,8 +1799,8 @@ class AdminActions extends BaseActions
 		
 		$selectData	= requestVar('selectData');
 		$mode		= $selectData['mode'];
-		$name		= ENTITY::hsc($selectData['name'], ENT_QUOTES);
-		$tabindex	= ENTITY::hsc($selectData['tabindex'], ENT_QUOTES);
+		$name		= Entity::hsc($selectData['name']);
+		$tabindex	= Entity::hsc($selectData['tabindex']);
 		$aBlogIds	= array_map('intval', $selectData['aBlogIds']);
 		$showNewCat	= intval($selectData['showNewCat']);
 		$selected	= intval($selectData['selected']);
@@ -1823,7 +1823,7 @@ class AdminActions extends BaseActions
 			{
 				if ( isset($multipleBlogs) && !empty($multipleBlogs) )
 				{
-					echo '<optgroup label="' . ENTITY::hsc($oBlog->bname, ENT_QUOTES) . "\>\n";
+					echo '<optgroup label="' . Entity::hsc($oBlog->bname) . "\>\n";
 				}
 				
 				// show selection to create new category when allowed/wanted
@@ -1850,7 +1850,7 @@ class AdminActions extends BaseActions
 					{
 						$selectText = '';
 					}
-					echo '<option value="' . $oCat->catid . '" ' . $selectText . '>' . ENTITY::hsc($oCat->cname, ENT_QUOTES) . "</option>\n";
+					echo '<option value="' . $oCat->catid . '" ' . $selectText . '>' . Entity::hsc($oCat->cname) . "</option>\n";
 				}
 				
 				if ( isset($multipleBlogs) && !empty($multipleBlogs) )
@@ -1867,11 +1867,11 @@ class AdminActions extends BaseActions
 				echo '<option value="' . $oBlog->bnumber . '"';
 				if ( $oBlog->bnumber == $selected )
 				{
-					echo '<option value="' . $oBlog->bnumber . '" selected="selected">' . ENTITY::hsc($oBlog->bname, ENT_QUOTES) . "</option>\n";
+					echo '<option value="' . $oBlog->bnumber . '" selected="selected">' . Entity::hsc($oBlog->bname) . "</option>\n";
 				}
 				else
 				{
-					echo '<option value="' . $oBlog->bnumber . '">' . ENTITY::hsc($oBlog->bname, ENT_QUOTES) . "</option>\n";
+					echo '<option value="' . $oBlog->bnumber . '">' . Entity::hsc($oBlog->bname) . "</option>\n";
 				}
 			}
 		}
@@ -2456,7 +2456,7 @@ class AdminActions extends BaseActions
 				break;
 			case 'body':
 				$body = strip_tags($comment['body']);
-				echo ENTITY::hsc(shorten($body, 300, '...'), ENT_QUOTES);
+				echo Entity::hsc(shorten($body, 300, '...'));
 		}
 		return;
 	}
@@ -2768,11 +2768,11 @@ class AdminActions extends BaseActions
 			case 'displayname':
 				if ( $this->skintype == 'teamdelete' || $this->skintype == 'memberdelete' )
 				{
-					echo ENTITY::hsc($mem->getDisplayName(), ENT_QUOTES);
+					echo Entity::hsc($mem->getDisplayName());
 				}
 				else
 				{
-					$dispName = ENTITY::hsc($mem->getDisplayName(), ENT_QUOTES);
+					$dispName = Entity::hsc($mem->getDisplayName());
 					if ( $CONF['AllowLoginEdit'] || $member->isAdmin() )
 					{
 						echo '<input name="name" tabindex="10" maxlength="32" size="32" value="' . $dispName . "\" />\n";
@@ -2784,13 +2784,13 @@ class AdminActions extends BaseActions
 				}
 				break;
 			case 'realname':
-				echo ENTITY::hsc($mem->getRealName(), ENT_QUOTES);
+				echo Entity::hsc($mem->getRealName());
 				break;
 			case 'email':
-				echo ENTITY::hsc($mem->getEmail(), ENT_QUOTES);
+				echo Entity::hsc($mem->getEmail());
 				break;
 			case 'url':
-				echo ENTITY::hsc($mem->getURL(), ENT_QUOTES);
+				echo Entity::hsc($mem->getURL());
 				break;
 			case 'admin':
 				$this->parse_inputyesno('admin', $mem->isAdmin(), 60, 1, 0, _YES, _NO, 0, $templateName);
@@ -2799,7 +2799,7 @@ class AdminActions extends BaseActions
 				$this->parse_inputyesno('canlogin', $mem->canLogin(), 70, 1, 0, _YES, _NO, $mem->isAdmin(), $templateName);
 				break;
 			case 'notes':
-				echo ENTITY::hsc($mem->getNotes(), ENT_QUOTES);
+				echo Entity::hsc($mem->getNotes());
 				break;
 			case 'autosave':
 				$this->parse_inputyesno('autosave', $mem->getAutosave(), 87, 1, 0, _YES, _NO, 0, $templateName);
@@ -3148,31 +3148,31 @@ class AdminActions extends BaseActions
 		switch ( $which )
 		{
 			case 'id':
-				return ENTITY::hsc($b->getID(), ENT_QUOTES);
+				return Entity::hsc($b->getID());
 				break;
 			case 'url':
-				return ENTITY::hsc($b->getURL(), ENT_QUOTES);
+				return Entity::hsc($b->getURL());
 				break;
 			case 'name':
-				return ENTITY::hsc($b->getName(), ENT_QUOTES);
+				return Entity::hsc($b->getName());
 				break;
 			case 'desc':
-				return ENTITY::hsc($b->getDescription(), ENT_QUOTES);
+				return Entity::hsc($b->getDescription());
 				break;
 			case 'short':
-				return ENTITY::hsc($b->getShortName(), ENT_QUOTES);
+				return Entity::hsc($b->getShortName());
 				break;
 			case 'notifyaddress':
-				return ENTITY::hsc($b->getNotifyAddress(), ENT_QUOTES);
+				return Entity::hsc($b->getNotifyAddress());
 				break;
 			case 'maxcomments':
-				return ENTITY::hsc($b->getMaxComments(), ENT_QUOTES);
+				return Entity::hsc($b->getMaxComments());
 				break;
 			case 'updatefile':
-				return ENTITY::hsc($b->getUpdateFile(), ENT_QUOTES);
+				return Entity::hsc($b->getUpdateFile());
 				break;
 			case 'timeoffset':
-				return ENTITY::hsc($b->getTimeOffset(), ENT_QUOTES);
+				return Entity::hsc($b->getTimeOffset());
 				break;
 		}
 		return;
-- 
2.11.0