Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

This commit is contained in:
Martin Konecny 2013-02-04 16:06:05 -05:00
parent 331386f74f b45f71e8f9
commit 5ce86b33ef
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/StoredFile.php
View File

@ -269,7 +269,7 @@ class Application_Model_StoredFile
$md = array(); $md = array();
foreach ($this->_dbMD as $dbColumn => $propelColumn) { foreach ($this->_dbMD as $dbColumn => $propelColumn) {
$method = "get$propelColumn"; $method = "get$propelColumn";
$md[$dbColumn] = htmlspecialchars($this->_file->$method()); $md[$dbColumn] = $this->_file->$method();
} }
return $md; return $md;

1
airtime_mvc/application/views/scripts/playlist/update.phtml
View File

@ -8,6 +8,7 @@ if ($item['type'] == 2) {
$bl= new Application_Model_Block($item['item_id']); $bl= new Application_Model_Block($item['item_id']);
$staticBlock = $bl->isStatic(); $staticBlock = $bl->isStatic();
} }
$item["track_title"] = $this->escape($item["track_title"]);
?> ?>
<li class="ui-state-default" id="spl_<?php echo $item["id"] ?>" unqid="<?php echo $item["id"]; ?>"> <li class="ui-state-default" id="spl_<?php echo $item["id"] ?>" unqid="<?php echo $item["id"]; ?>">
<div class="list-item-container"> <div class="list-item-container">