[geeklog-hg] [Geeklog-Core/geeklog] 5ebf31: Additional fix for issue #987

[Kenji ITO]

  Branch: refs/heads/master
  Home:   https://github.com/Geeklog-Core/geeklog
  Commit: 5ebf311c519713c803feeb069c2de17f3f00665f
      https://github.com/Geeklog-Core/geeklog/commit/5ebf311c519713c803feeb069c2de17f3f00665f
  Author: mystralkk <mystralkk at gmail.com>
  Date:   2019-11-12 (Tue, 12 Nov 2019)

  Changed paths:
    M system/classes/dbbackup.class.php

  Log Message:
  -----------
  Additional fix for issue #987


  Commit: 0d029fc4e91f40bc3d57b567dd7d546d6ab940cf
      https://github.com/Geeklog-Core/geeklog/commit/0d029fc4e91f40bc3d57b567dd7d546d6ab940cf
  Author: mystralkk <mystralkk at gmail.com>
  Date:   2019-11-12 (Tue, 12 Nov 2019)

  Changed paths:
    M language/english.php
    M language/english_utf-8.php
    M public_html/layout/denim/preferences/boxesblock.thtml
    M public_html/layout/denim/preferences/displayblock.thtml
    M public_html/layout/denim_three/preferences/boxesblock.thtml
    M public_html/layout/denim_three/preferences/displayblock.thtml
    M public_html/layout/modern_curve/preferences/boxesblock.thtml
    M public_html/layout/modern_curve/preferences/displayblock.thtml
    M public_html/lib-common.php
    M public_html/usersettings.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Geeklog-Core/geeklog


Compare: https://github.com/Geeklog-Core/geeklog/compare/05e3e9d4cb8e...0d029fc4e91f