Missing checks for Zenpage news and/or pages being enabled on themes' search.php
Merge remote-tracking branch 'upstream/master' into upstream

Note, the changes made to zenphoto are pure garbage. The proper way to do this has been in
ZenPhoto20 for ages and involves not returning a page/news count if the feature is disabled.

But any way, the change was useful. It did force me to figure out how to do a merge without
necessarily taking the changes even though they could be applied without conflict.

	modified:   themes/basic/album.php