Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion lib/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ protected function setSystemRequirements(): void
mb_internal_encoding('UTF-8');

// zlib.output_compression conflicts with while (@ob_end_flush()) ;
// see also: https://github.com/pimcore/pimcore/issues/291
if (ini_get('zlib.output_compression')) {
@ini_set('zlib.output_compression', 'Off');
}
Expand Down
1 change: 0 additions & 1 deletion lib/Navigation/Container.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@

/**
* NOTICE: Native types for `Page` are explicitly not used in this class to avoid OPCache issues
* See this issue for details: https://github.com/pimcore/pimcore/issues/15970
*/
class Container implements RecursiveIterator, Countable
{
Expand Down
1 change: 0 additions & 1 deletion lib/Routing/Dynamic/DocumentRouteHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ private function handleDirectRouteDocument(

// Use latest version, if available, when the request is admin request
// so then route should be built based on latest Document settings
// https://github.com/pimcore/pimcore/issues/9644
if ($isAdminRequest) {
$latestVersion = $document->getLatestVersion();
if ($latestVersion) {
Expand Down
3 changes: 0 additions & 3 deletions lib/Tool/Authentication.php
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,8 @@ public static function getPasswordHash(string $username, string $plainTextPasswo

private static function preparePlainTextPassword(string $username, string $plainTextPassword): string
{

$config = Config::getSystemConfiguration()['security']['password'];

// plaintext password is prepared as digest A1 hash, this is to be backward compatible because this was
// the former hashing algorithm in pimcore (< version 2.1.1)
return md5(sprintf('%s:%s:%s', $username, $config['salt'], $plainTextPassword));
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Tool/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ private static function getElementsTagsInWysiwyg(string $text): array
return RuntimeCache::get($hash);
}

//$text = Pimcore_Tool_Text::removeLineBreaks($text);
//$text = \OpenDxp\Tool\Text::removeLineBreaks($text);

$matches = self::extractOpenDxpAttributes($text);

Expand Down
2 changes: 1 addition & 1 deletion models/Document/Editable/Block.php
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ public function getElements(): array
{
$document = $this->getDocument();

// https://github.com/pimcore/pimcore/issues/6629
// prevent exception if block has a default value
if (!$document instanceof Model\Document\PageSnippet) {
return [];
}
Expand Down
4 changes: 2 additions & 2 deletions models/Element/Recyclebin/Item.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ public function restore(?Model\User $user = null): void
$element->setKey($element->getKey().'_restore');
}

// create an empty object first and clone it
// see https://github.com/pimcore/pimcore/issues/4219
// create an empty object first and clone it to prevent that unique key constraint is being ignored
// when restoring from recycle bin
Model\Version::disable();
$className = $element::class;
/** @var Document|Asset|AbstractObject $dummy */
Expand Down
2 changes: 0 additions & 2 deletions models/User/AbstractUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,6 @@ public function delete(): void
}

/**
* https://github.com/pimcore/pimcore/issues/7085
*
* @throws Exception
*/
private function cleanupUserRoleRelations(): void
Expand Down
1 change: 0 additions & 1 deletion tests/Model/Inheritance/GeneralTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ public function testInheritance(): void
}

/**
* Tests https://github.com/pimcore/pimcore/pull/6269
* [Data objects] Override inherited value with same value (break inheritance)
*
* @throws Exception
Expand Down
3 changes: 0 additions & 3 deletions tests/Service/Element/VersionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@ public function testDisable(): void
$this->assertEquals(3, $countAfterSave, "seems that Version::enable doesn't work");
}

/**
* Test for https://github.com/pimcore/pimcore/issues/4667
*/
public function testCondense(): void
{
$this->setStorageAdapter($this->mockFileSystemStorageAdapter());
Expand Down