merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -24,7 +24,7 @@ class TrashVO
function getTitle()
{
if(empty($this->title)) return $lang->untitle;
return $this->title;
return htmlspecialchars($this->title);
}
function setTitle($title)
{
@ -49,7 +49,7 @@ class TrashVO
}
function getDescription()
{
return $this->description;
return htmlspecialchars($this->description);
}
function setDescription($description)
{
@ -81,7 +81,7 @@ class TrashVO
}
function getNickName()
{
return $this->nickName;
return htmlspecialchars($this->nickName);
}
function setNickName($nickName)
{