Merge branch '2.2.x' into devel

This commit is contained in:
denise 2012-11-21 10:54:17 -05:00
commit f88a7bdb31
4 changed files with 17 additions and 7 deletions

View file

@ -467,9 +467,9 @@ SQL;
Logging::info("Adding to block");
Logging::info("at position {$pos}");
}
foreach ($p_items as $ac) {
Logging::info("Adding audio file {$ac}");
Logging::info("Adding audio file {$ac[0]}");
try {
if (is_array($ac) && $ac[1] == 'audioclip') {
$res = $this->insertBlockElement($this->buildEntry($ac[0], $pos));