Navigation Menu

Skip to content

Commit

Permalink
Fix small regression in derivatives params.
Browse files Browse the repository at this point in the history
  • Loading branch information
nikrou committed Nov 23, 2018
1 parent e3509f6 commit ffbf04b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -3,7 +3,7 @@ Phyxo

Simply share your images.

![alt tag](https://www.phyxo.net/screenshot.png "Phyxo screenshot")
![alt tag](https://www.phyxo.net/demo-home.png "Phyxo screenshot")

Requirements
------------
Expand Down
4 changes: 0 additions & 4 deletions TODO.md
Expand Up @@ -12,7 +12,3 @@
- use more friendly assertion (example: see modal instead of see #cboxWrapper)

- Check modifiers(translation, explode, ternary) in template class

- Find a way to provide simple menu categories and recursive one but not both
- Give better user experience in case of upgrade in minor or major version. Display a real page not an almost blank page.
- Fix use of PHPWG_ROOT_PATH that is used for filesystem root path and URL path
7 changes: 6 additions & 1 deletion src/Phyxo/Image/ImageStdParams.php
Expand Up @@ -116,7 +116,12 @@ public static function load_from_db()
{
global $conf;

$arr = @unserialize(stripslashes($conf['derivatives']));
// ugly hack before refactoring
if (!empty($conf['dblayer']) && $conf['dblayer'] === 'mysql') {
$arr = @unserialize(stripslashes($conf['derivatives']));
} else {
$arr = @unserialize($conf['derivatives']);
}
if (false !== $arr) {
self::$type_map = $arr['d'];
self::$watermark = @$arr['w'];
Expand Down

0 comments on commit ffbf04b

Please sign in to comment.