BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf

Browse Source
This commit is contained in:
Richard Alam 2017-08-31 08:49:41 -07:00
commit 5d60a59650
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bbb-common-web/src/main/java/org/bigbluebutton/api/util/RecordingMetadataReaderHelper.java
View File

@ -49,11 +49,6 @@ public class RecordingMetadataReaderHelper {
log.error("IOException on " + metadataXml.getAbsolutePath(), e);
}
if (recMeta == null) {
recMeta = new RecordingMetadata();
recMeta.setMetadataXml(metadataXml.getParentFile().getName());
recMeta.setProcessingError(true);
}
return recMeta;
}

2
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View File

@ -1561,7 +1561,7 @@ class ApiController {
returncode(RESP_CODE_SUCCESS)
recordings(null)
messageKey("noRecordings")
message("There are not recordings for the meetings")
message("There are no recordings for the meeting(s).")
}
}
}