#1394: Update hook for cp_layout.
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7
define() takes a string as its first param
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7