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

Merge branch '2.2.x' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
This commit is contained in:
denise 2012-11-07 11:21:36 -05:00
commit b817684972
33 changed files with 167 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/LibraryController.php
View file

@ -178,7 +178,7 @@ class LibraryController extends Zend_Controller_Action
if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
if ($obj_sess->type === "playlist") {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
} elseif ($obj_sess->type === "block") {
} elseif ($obj_sess->type === "block" && $obj->isStatic()) {
$menu["pl_add"] = array("name"=> "Add to Smart Block", "icon" => "add-playlist", "icon" => "copy");
}
}