yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/6.2.0' into 7.0.1

Browse Source 
Conflicts:
	src/Umbraco.Tests/PluginManagerTests.cs
This commit is contained in:
Shannon
2013-12-10 10:00:37 +11:00
parent b12cd81c01 94db371234
commit bffe52e060
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Umbraco.Tests/PluginManagerTests.cs
View File

@@ -337,28 +337,28 @@ namespace Umbraco.Tests
Assert.AreEqual(3, types.Count());
}
/// <summary>
/// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types
/// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way.
/// </summary>
[Test]
public void TypeList_Resolves_Explicit_Types()
{
var types = new HashSet<PluginManager.TypeList>();
///// <summary>
///// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types
///// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way.
///// </summary>
//[Test]
//public void TypeList_Resolves_Explicit_Types()
//{
// var types = new HashSet<PluginManager.TypeList>();
var propEditors = new PluginManager.TypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes);
propEditors.AddType(typeof (LabelPropertyEditor));
types.Add(propEditors);
// var propEditors = new PluginManager.TypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes);
// propEditors.AddType(typeof (LabelPropertyEditor));
// types.Add(propEditors);
var found = types.SingleOrDefault(x => x.IsTypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
// var found = types.SingleOrDefault(x => x.IsTypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
Assert.IsNotNull(found);
// Assert.IsNotNull(found);
//This should not find a type list of this type
var shouldNotFind = types.SingleOrDefault(x => x.IsTypeList<IParameterEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
// //This should not find a type list of this type
// var shouldNotFind = types.SingleOrDefault(x => x.IsTypeList<IParameterEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
Assert.IsNull(shouldNotFind);
}
// Assert.IsNull(shouldNotFind);
//}
[XsltExtension("Blah.Blah")]
public class MyXsltExtension

1
src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
View File

@@ -29,7 +29,6 @@ namespace umbraco.cms.presentation.create.controls
Cultures.Items.Add(new ListItem(ui.Text("choose") + "...", ""));
foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.AllCultures))
{
if (!ci.IsNeutralCulture && !languageExists(ci.Name))
sortedCultures.Add(ci.DisplayName + "|||" + Guid.NewGuid().ToString(), ci.Name);
}