mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-08 19:21:40 +09:00
reverse merge from 1.6.0 (r10668)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10683 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
c25b22d669
commit
b52d9f1129
1 changed files with 2 additions and 9 deletions
|
|
@ -51,15 +51,9 @@
|
|||
$style = $xml_obj->attrs->style;
|
||||
$margin = (int)$xml_obj->attrs->margin;
|
||||
|
||||
if(!$alt) {
|
||||
$tmp_arr = explode('/',$src);
|
||||
$alt = array_pop($tmp_arr);
|
||||
}
|
||||
|
||||
$src = str_replace(array('&','"'), array('&','&qout;'), $src);
|
||||
$src = str_replace('&', '&', $src);
|
||||
|
||||
if(!$alt) $alt = $src;
|
||||
// Image containing the address to the address conversion request uri (rss output, etc. purposes)
|
||||
$temp_src = explode('/', $src);
|
||||
if(substr($src, 0,2)=='./') $src = Context::getRequestUri().substr($src, 2);
|
||||
|
|
@ -72,9 +66,8 @@
|
|||
|
||||
$attr_output = array();
|
||||
$attr_output = array("src=\"".$src."\"");
|
||||
if($alt) {
|
||||
$attr_output[] = "alt=\"".$alt."\"";
|
||||
}
|
||||
$attr_output[] = "alt=\"".$alt."\"";
|
||||
|
||||
if($title) {
|
||||
$attr_output[] = "title=\"".$title."\"";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue