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

Fixes: 27796

Browse Source 
[TFS Changeset #70550]
This commit is contained in:
Shandem
2010-06-21 15:57:43 +00:00
parent 2db0daf773
commit 5d8b5a13b8
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config templates/config/ClientDependency.config
View File

@@ -10,7 +10,7 @@ NOTES:
* Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
* A new version will invalidate both client and server cache and create new persisted files
-->
<clientDependency version="34">
<clientDependency version="35">
<fileRegistration defaultProvider="LoaderControlProvider" fileDependencyExtensions=".js,.css">
<providers>

20
umbraco/cms/businesslogic/member/MemberType.cs
View File

@@ -95,11 +95,21 @@ namespace umbraco.cms.businesslogic.member
/// </summary>
/// <param name="Alias">The alias of the MemberType</param>
/// <returns>The MemberType with the given Alias</returns>
public static new MemberType GetByAlias(string Alias)
{
return new MemberType(SqlHelper.ExecuteScalar<int>("SELECT nodeid from cmsContentType where alias = @alias",
SqlHelper.CreateParameter("@alias", Alias)));
}
public new static MemberType GetByAlias(string Alias)
{
try
{
return
new MemberType(
SqlHelper.ExecuteScalar<int>(@"SELECT nodeid from cmsContentType INNER JOIN umbracoNode on cmsContentType.nodeId = umbracoNode.id WHERE nodeObjectType=@nodeObjectType AND alias=@alias",
SqlHelper.CreateParameter("@nodeObjectType", MemberType._objectType),
SqlHelper.CreateParameter("@alias", Alias)));
}
catch
{
return null;
}
}
/// <summary>

5
umbraco/cms/businesslogic/web/DocumentType.cs
View File

@@ -120,8 +120,9 @@ namespace umbraco.cms.businesslogic.web
{
return
new DocumentType(
SqlHelper.ExecuteScalar<int>("SELECT nodeid from cmsContentType where alias = @alias",
SqlHelper.CreateParameter("@alias", Alias)));
SqlHelper.ExecuteScalar<int>(@"SELECT nodeid from cmsContentType INNER JOIN umbracoNode on cmsContentType.nodeId = umbracoNode.id WHERE nodeObjectType=@nodeObjectType AND alias=@alias",
SqlHelper.CreateParameter("@nodeObjectType", DocumentType._objectType),
SqlHelper.CreateParameter("@alias", Alias)));
}
catch
{

2
umbraco/presentation/config/ClientDependency.config
View File

@@ -10,7 +10,7 @@ NOTES:
* Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
* A new version will invalidate both client and server cache and create new persisted files
-->
<clientDependency version="34">
<clientDependency version="35">
<fileRegistration defaultProvider="LoaderControlProvider" fileDependencyExtensions=".js,.css">
<providers>