mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-05 11:32:12 +09:00
merge from 1.5.3.2 (embed white list, 11024,11028, 11029,11031,11034)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11035 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
ef0fdbe038
commit
d28e3e4176
25 changed files with 1651 additions and 2 deletions
|
|
@ -408,7 +408,10 @@ class documentController extends document {
|
|||
}
|
||||
}
|
||||
// Remove iframe and script if not a top adminisrator in the session.
|
||||
if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
|
||||
if($logged_info->is_admin != 'Y')
|
||||
{
|
||||
$obj->content = removeHackTag($obj->content);
|
||||
}
|
||||
// if temporary document, regdate is now setting
|
||||
if($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue