[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 969352: Revert "Use unserialize without objects if availab...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9693522a86757862671c1197dc767c72b04ba3aa
      https://github.com/phpmyadmin/phpmyadmin/commit/9693522a86757862671c1197dc767c72b04ba3aa
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/core.lib.php

  Log Message:
  -----------
  Revert "Use unserialize without objects if available"

This reverts commit d61dbc1d6fbb30c5d661921400e31d5bd920cae2.

Honestly I don't think this work as documented:

PHP Warning:  unserialize() expects parameter 2 to be array, boolean given


  Commit: c1cc04c29809b8f33c9ae2fc5adad4d8bb2b6fc6
      https://github.com/phpmyadmin/phpmyadmin/commit/c1cc04c29809b8f33c9ae2fc5adad4d8bb2b6fc6
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/core.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_6'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0079d9a9408f...c1cc04c29809