tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-08-19 Hirofumi Kosaka <kosaka@rworks.jp> 

* include/functions_api.php: Small Fix. Corrected error message.

	MERGED FROM branch4.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8678 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2013-08-19 08:00:31 +00:00
parent 7e9f0b1718
commit a3c69476df
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-08-19 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Small Fix. Corrected error message.
MERGED FROM branch4.x
2013-08-19 Miguel de Dios <miguel.dedios@artica.es>
* general/logon_ok.php, godmode/setup/news.php: fixed the lost

2
pandora_console/include/functions_api.php
View File

@ -4168,7 +4168,7 @@ function api_set_enable_disable_user ($id, $thrash2, $other, $thrash3) {
if (is_error($result)) {
// TODO: Improve the error returning more info
returnError('error_create_network_module', __('Error in user enabling/disabling.'));
returnError('error_enable_disable_user', __('Error in user enabling/disabling.'));
}
else {
if ($other['data'][0] == "0"){