[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9f186a: ini_set: Use string for param 2

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9f186aae7d1904b8721964db82ce6a7c940b00e6
      https://github.com/phpmyadmin/phpmyadmin/commit/9f186aae7d1904b8721964db82ce6a7c940b00e6
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M libraries/Config.class.php

  Log Message:
  -----------
  ini_set: Use string for param 2

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: e98a9a7bdb4ea1fa80c286c7868ef0535d4a685e
      https://github.com/phpmyadmin/phpmyadmin/commit/e98a9a7bdb4ea1fa80c286c7868ef0535d4a685e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M libraries/Config.class.php

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/737df91c370d...e98a9a7bdb4e