Skip to content

Commit

Permalink
Merge pull request #57 from JarvusInnovations/develop
Browse files Browse the repository at this point in the history
Release: emergece v1.0.2
  • Loading branch information
themightychris authored Dec 31, 2017
2 parents db4f67e + 838216a commit 9c67040
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions kernel-lib/services/nginx.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ exports.NginxService.prototype.makeConfig = function() {

' location / {',
' include '+me.options.miscConfigDir+'/fastcgi_params;',
' fastcgi_keep_conn on;',
' fastcgi_param HTTPS $php_https;',
' fastcgi_pass '+phpSocketPath+';',
' fastcgi_param PATH_INFO $fastcgi_script_name;',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "emergence",
"preferGlobal": true,
"version": "1.0.1",
"version": "1.0.2",
"license": "MIT",
"dependencies": {
"hostile": "^1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion php-bootstrap/lib/Emergence_FS.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ public static function exportTree($sourcePath, $destinationPath, $options = arra


// build map of subtrees to be written and create directories
$prefixLen = strlen($sourcePath);
$prefixLen = strlen($destinationPath);
$tree = static::getTree($sourcePath, $options['localOnly']);

foreach ($tree AS $collectionID => &$node) {
Expand Down

0 comments on commit 9c67040

Please sign in to comment.