[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 42706a: * The last variable was not substituted

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 42706ab2b218a5ea4a1e4c78ff4e904c5dff8a43 https://github.com/phpmyadmin/phpmyadmin/commit/42706ab2b218a5ea4a1e4c78ff4… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-04-09 (Thu, 09 Apr 2015) Changed paths: M libraries/bookmark.lib.php Log Message: ----------- * The last variable was not substituted * Call PMA_Bookmark_getVariableCount() only once Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 4c4583deb068f6ebc8e0b45a38200e2eb3b59337 https://github.com/phpmyadmin/phpmyadmin/commit/4c4583deb068f6ebc8e0b45a382… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-04-09 (Thu, 09 Apr 2015) Changed paths: M ChangeLog M libraries/plugins/import/ImportSql.class.php Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4bb1346913fa...4c4583deb068