Merge branch 'master' into backbone

Conflicts:
	.gitignore
This commit is contained in:
Mark McDowall
2012-12-23 00:46:23 -08:00
57 changed files with 1891 additions and 121 deletions

View File

@@ -101,5 +101,15 @@ namespace NzbDrone.Core.Providers
return false;
}
public virtual string GetCleanName(int seriesId)
{
var item = _database.FirstOrDefault<SceneMapping>("WHERE SeriesId = @0", seriesId);
if (item == null)
return null;
return item.CleanTitle;
}
}
}