Permalink
Browse files

Merge branch 'master' into 0.8.0

# Conflicts:
#	package.json
#	yuidoc.json
  • Loading branch information...
brianhyder committed Jan 5, 2017
2 parents 67440d5 + e80d226 commit 55190f6817d9cb7e339fd13e1b33034e695473d4
@@ -32,7 +32,6 @@ module.exports = function BaseAdminControllerModule(pb) {
/**
* Initializes the admin controller with site-related info
* @override
* @method init
* @param {Object} props
* @param {Function} cb
@@ -46,7 +45,6 @@ module.exports = function BaseAdminControllerModule(pb) {
/**
* Initializes the admin controller with instance variables
* @override
* @method extendedInit
* @param {Function} cb
*/
@@ -87,6 +87,8 @@ class ErrorUtils {
/**
* Creates a custom error with a specific message and status code
* @static
* @method custom
* @param {string} [message='An Error Occurred']
* @param {Number} [code=500]
* @return {Error}
@@ -491,6 +491,7 @@ module.exports = function(pb) {
/**
* Validates that a headline is provided and is unique
* @method validateHeadline
* @param {object} context
* @param {object} context.data
* @param {Array} context.validationErrors
@@ -227,7 +227,6 @@ module.exports = function SiteQueryServiceModule(pb) {
/**
* Overriding protected method of DAO to achieve site-aware query
* @override
* @protected
* @method _doQuery
* @param {Object} options
@@ -203,6 +203,7 @@ module.exports = function WPXMLParseServiceModule(pb) {
users[index].email = 'user_' + util.uniqueId() + '@placeholder.com';
users[index].admin = pb.SecurityService.ACCESS_WRITER;
users[index].password = generatedPassword;
users[index].locale = 'en-US';
self.service.add(users[index], function(err, result) {
if (util.isError(err)) {

0 comments on commit 55190f6

Please sign in to comment.