merge from 1.5.3 (~r10951). required minify admin.min.js

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10952 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 03:04:27 +00:00
commit d97822999e
34 changed files with 233 additions and 127 deletions

View file

@ -188,7 +188,8 @@
$output = $this->updateLayout($args);
if(!$output->toBool()) return $output;
return $this->setRedirectUrl(Context::get('error_return_url'), $output);
$this->setRedirectUrl(Context::get('error_return_url'));
return $output;
}
/**