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

Fixes merge issues

Browse Source
This commit is contained in:
Shannon Deminick
2013-04-09 07:54:32 +06:00
parent 30be665a40
commit eadb1bb194
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
View File

@@ -40,7 +40,7 @@ namespace umbraco.presentation.webservices
{
bool isUpgrade = false;
// if it's an upgrade, you'll need to be logged in before we allow this call
if (!String.IsNullOrEmpty(Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
if (!String.IsNullOrEmpty(global::Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
{
isUpgrade = true;
legacyAjaxCalls.Authorize();
@@ -63,7 +63,7 @@ namespace umbraco.presentation.webservices
installCookie.SetValue(installId.ToString());
string dbProvider = String.Empty;
if (!String.IsNullOrEmpty(Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
if (!String.IsNullOrEmpty(global::Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
org.umbraco.update.CheckForUpgrade check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade();

30
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
View File

@@ -93,28 +93,28 @@ namespace umbraco.presentation.webservices
if (isContent)
{
var document = new Document(int.Parse(tmp[i]));
var published = document.Published;
document.sortOrder = i;
document.Save();
var document = new Document(int.Parse(tmp[i]));
var published = document.Published;
document.sortOrder = i;
document.Save();
// refresh the xml for the sorting to work
if (d.Published)
if (published)
{
document.Publish(BusinessLogic.User.GetCurrent());
document.refreshXmlSortOrder();
document.Publish(BusinessLogic.User.GetCurrent());
document.refreshXmlSortOrder();
library.UpdateDocumentCache(int.Parse(tmp[i]));
}
}
// to update the sortorder of the media node in the XML, re-save the node....
// to update the sortorder of the media node in the XML, re-save the node....
else if (isMedia)
{
var media = new cms.businesslogic.media.Media(int.Parse(tmp[i]));
media.sortOrder = i;
media.Save();
}
else
{
new cms.businesslogic.CMSNode(int.Parse(tmp[i])).sortOrder = i;
var media = new cms.businesslogic.media.Media(int.Parse(tmp[i]));
media.sortOrder = i;
media.Save();
}
else
{
new cms.businesslogic.CMSNode(int.Parse(tmp[i])).sortOrder = i;
}
}