Revert "11"

This reverts commit 275fef14470dfa1d8821b9c91bfbdad3871c6c8c.

Conflicts:
	temp/compiled/E__www_edh_themes_default_lib_shopcar.html.php
	temp/slowsql.php
	themes/default/lib/shopcar.html
Merge branch 'master' of https://github.com/wanghexiang/edh
1
1