[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ee8692: fix strpos called on object

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ee8692e9802c24e55ae28e37ad3ca535c93515d5
      https://github.com/phpmyadmin/phpmyadmin/commit/ee8692e9802c24e55ae28e37ad3ca535c93515d5
  Author: Alex Marin <alex.ukf at gmail.com>
  Date:   2012-06-30 (Sat, 30 Jun 2012)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  fix strpos called on object


  Commit: a042003c329a807e4025b198f0dbe37ad0ae2499
      https://github.com/phpmyadmin/phpmyadmin/commit/a042003c329a807e4025b198f0dbe37ad0ae2499
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-06-30 (Sat, 30 Jun 2012)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Merge pull request #76 from alexukf/plugins-and-OOP

Fix strpos called on object


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a83f42eaa661...a042003c329a