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

Work items: 30313, 29864

Browse Source
This commit is contained in:
hartvig
2011-09-06 07:43:36 -02:00
parent 88316b05c4
commit caad0e25d1
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
umbraco/cms/businesslogic/web/Document.cs
View File

@@ -592,7 +592,15 @@ namespace umbraco.cms.businesslogic.web
public static void RePublishAll()
{
XmlDocument xd = new XmlDocument();
SqlHelper.ExecuteNonQuery("truncate table cmsContentXml");
if (!DataLayerHelper.IsEmbeddedDatabase(SqlHelper.ConnectionString))
{
SqlHelper.ExecuteNonQuery("truncate table cmsContentXml");
}
else
{
SqlHelper.ExecuteNonQuery("delete from cmsContentXml");
}
IRecordsReader dr = SqlHelper.ExecuteReader("select nodeId from cmsDocument where published = 1");
while (dr.Read())
@@ -1306,20 +1314,20 @@ namespace umbraco.cms.businesslogic.web
&& p.Value.ToString() != ""
&& File.Exists(IOHelper.MapPath(p.Value.ToString())))
{
int propId = newDoc.getProperty(p.PropertyType.Alias).Id;
System.IO.Directory.CreateDirectory(IOHelper.MapPath(SystemDirectories.Media + "/" + propId.ToString()));
string fileCopy = IOHelper.MapPath(
SystemDirectories.Media + "/" +
SystemDirectories.Media + "/" +
propId.ToString() + "/" +
new FileInfo(IOHelper.MapPath(p.Value.ToString())).Name);
File.Copy(IOHelper.MapPath(p.Value.ToString()), fileCopy);
string relFilePath =
SystemDirectories.Media + "/" +
SystemDirectories.Media + "/" +
propId.ToString() + "/" +
new FileInfo(IOHelper.MapPath(p.Value.ToString())).Name;
@@ -1331,7 +1339,7 @@ namespace umbraco.cms.businesslogic.web
//copy thumbs
FileInfo origFile = new FileInfo(IOHelper.MapPath(p.Value.ToString()));
foreach(FileInfo thumb in origFile.Directory.GetFiles("*_thumb*"))
foreach (FileInfo thumb in origFile.Directory.GetFiles("*_thumb*"))
{
if (!File.Exists(IOHelper.MapPath(
SystemDirectories.Media + "/" +
@@ -1346,7 +1354,7 @@ namespace umbraco.cms.businesslogic.web
}
}
else
{

5
umbraco/datalayer/DataLayerHelper.cs
View File

@@ -117,6 +117,11 @@ namespace umbraco.DataLayer
}
}
public static bool IsEmbeddedDatabase(string connectionString)
{
return connectionString.ToLower().Contains("SQLCE4Umbraco.SqlCEHelper".ToLower());
}
#endregion
}
}