harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Importing webpage elements from manually entered cloud file path work. All detected elements are automatically imported.

Browse Source
This commit is contained in:
Andrew Manning
2016-07-17 16:05:26 -04:00
parent 75fb065526
commit d6b28cdc57
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/import.php
View File

@@ -1223,15 +1223,15 @@ function scan_webpage_elements($path, $type, $cloud = false) {
$dirtoscan = $path;
switch ($type) {
case 'page':
$dirtoscan .= '/pages/';
$dirtoscan .= 'pages/';
$json_filename = 'page.json';
break;
case 'layout':
$dirtoscan .= '/layouts/';
$dirtoscan .= 'layouts/';
$json_filename = 'layout.json';
break;
case 'block':
$dirtoscan .= '/blocks/';
$dirtoscan .= 'blocks/';
$json_filename = 'block.json';
break;
default :
@@ -1251,7 +1251,7 @@ function scan_webpage_elements($path, $type, $cloud = false) {
$folder = $dirtoscan . '/' . $element;
if (is_dir($folder)) {
if($cloud) {
$jsonfilepath = get_filename_by_cloudname($json_filename, $channel, $folder);
$jsonfilepath = $folder . '/' . get_filename_by_cloudname($json_filename, $channel, $folder);
} else {
$jsonfilepath = $folder . '/' . $json_filename;
}