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

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

Browse source
This commit is contained in:
denise 2013-01-30 10:20:27 -05:00
commit d4742577c9
14 changed files with 160 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/models/ShowBuilder.php
View file

@ -227,7 +227,7 @@ class Application_Model_ShowBuilder
$row["endDate"] = $showEndDT->format("Y-m-d");
$row["endTime"] = $showEndDT->format("H:i");
$row["duration"] = floatval($showEndDT->format("U.u")) - floatval($showStartDT->format("U.u"));
$row["title"] = $p_item["show_name"];
$row["title"] = htmlspecialchars($p_item["show_name"]);
$row["instance"] = intval($p_item["si_id"]);
$row["image"] = '';

2
airtime_mvc/application/models/User.php
View file

@ -335,6 +335,8 @@ class Application_Model_User
} else {
$record['delete'] = "";
}
$record = array_map('htmlspecialchars', $record);
}
return $res;