Skip to content

Commit

Permalink
Merge pull request #301 from quantacms/aldo-dev
Browse files Browse the repository at this point in the history
Aldo dev
  • Loading branch information
Aldus83 committed Apr 3, 2020
2 parents ebc29a3 + 49e52be commit aa842d2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/modules/image/classes/Qtags/Img.qtag.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function render() {

// Load classes.
if (!empty($this->attributes['img_class'])) {
$this->html_params['class'] .= $this->attributes['img_class'];
$this->html_params['class'] .= ' ' . $this->attributes['img_class'];
}
// When there is a request for editing the Image "on the fly" (i.e. scale or resize)...
// ...Proceed with creating and rendering the new manipulated image.
Expand Down
1 change: 1 addition & 0 deletions src/modules/user/classes/Common/UserFactory.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ public static function requestAction(Environment $env, $action, FormState $form_
$user = new User($env, $form_state->getData('username'), '_users');

$vars = array('user' => $user);

// Check if the current user is allowed to perform the requested action.
$access_check = UserAccess::check($env, $action, $vars);
if ($access_check) {
Expand Down
5 changes: 2 additions & 3 deletions src/modules/user/hooks/user.hook.inc
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ function user_action_user_edit_own(Environment $env, array &$vars) {
}

/**
* Implements hook_action_user_register().
* Implements hook_user_form_form_submit().
* There is an user registration request.
*
* @param Environment $env
Expand All @@ -218,7 +218,6 @@ function user_user_form_form_submit(Environment $env, array &$vars) {

// Prepare the response object.
$response = new \stdClass();

/** @var FormState $form_state */
$form_state = $vars['form_state'];

Expand All @@ -227,7 +226,7 @@ function user_user_form_form_submit(Environment $env, array &$vars) {
// Perform the registration of the user.
$user = UserFactory::load($env, $form_state->getData('username'));
// Immediate login of the user. TODO: make this optional.
$user->logIn(NULL, NULL, array('%user' => $form_state->getData('username')), TRUE);
// $user->logIn(NULL, NULL, array('%user' => $form_state->getData('username')), TRUE);
$vars['user'] = $user;
// Encode the response JSON code.
}
Expand Down

0 comments on commit aa842d2

Please sign in to comment.