Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix new lines #210

Merged
merged 4 commits into from
Jul 9, 2024
Merged

Fix new lines #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7525d0b
Fix new lines
daVitekPL Jun 27, 2024
33d5e6e
Merge remote-tracking branch 'origin/main' into feature/h5p-spaces
daVitekPL Jul 9, 2024
493d1e7
Fix phpstan
daVitekPL Jul 9, 2024
a9b486e
fix
daVitekPL Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Helpers/JSONHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public static function clearJson($json): string
$json = json_encode($json);
}

$json = str_replace(['\n', '\t'], '', $json);
$json = str_replace(['\t'], '', $json);
$json = str_replace(['\"', '"'], '\'', $json);
return str_replace(['\/'], '/', $json);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Repositories/H5PFileStorageRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public function exportContent($id, $target)

public function exportLibrary($library, $target, $developmentPath = NULL)
{
$folder = \H5PCore::libraryToString($library, TRUE);
$folder = \H5PCore::libraryToString($library);
$srcPath = ($developmentPath === NULL ? "/libraries/{$folder}" : $developmentPath);
$this->copyFiles("{$this->path}{$srcPath}", "{$target}/{$folder}");
}
Expand Down
2 changes: 1 addition & 1 deletion src/Services/H5PCoreService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class H5PCoreService extends H5PCore
{
protected bool $exportEnabled;
public bool $aggregateAssets;
public $aggregateAssets;

public function __construct(H5PFrameworkInterface $H5PFramework, $path, $url, $language = 'en', $export = FALSE)
{
Expand Down
Loading