Skip to content

Commit

Permalink
Merge pull request #216 from scollado/fix-tmbURL-option
Browse files Browse the repository at this point in the history
Fix case of tmbURL option
  • Loading branch information
helios-ag committed Jan 24, 2016
2 parents eeef956 + 6b146cc commit 6e04cde
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Configuration/ElFinderConfigurationReader.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function getConfiguration($instance)
'imgLib' => $parameter['img_lib'],
'tmbPath' => $parameter['tmb_path'],
'tmbPathMode' => $parameter['tmb_path_mode'],
'tmbUrl' => $parameter['tmb_url'],
'tmbURL' => $parameter['tmb_url'],
'tmbSize' => $parameter['tmb_size'],
'tmbCrop' => $parameter['tmb_crop'],
'tmbBgColor' => $parameter['tmb_bg_color'],
Expand Down
6 changes: 6 additions & 0 deletions Tests/Configuration/ElFinderConfigurationReaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -303,4 +303,10 @@ public function testPathAndUrlAndHomeFolder()
$this->assertEquals('/bob', $configuration['roots'][0]['path']);
$this->assertEquals('http://test.com/unit-test/home-url-without-path/bob', $configuration['roots'][0]['URL']);
}

public function testAccessTmbURLOpion()
{
$configuration = $this->reader->getConfiguration('default');
$this->assertArrayHasKey('tmbURL', $configuration['roots'][0]);
}
}

0 comments on commit 6e04cde

Please sign in to comment.