oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 6.8 bugfixes

Browse source
This commit is contained in:
Roy Johnson 2006-02-12 18:00:56 +00:00
parent a6d6d26134
commit c80902b65d
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/changelog/6.x.x.txt
View file

@ -43,6 +43,12 @@
- fix [ 1429349 ] Invalid HTML returned by func=manageAssets
- fix [ 1429348 ] Textboxes need to filter CR/LF
- fix [ 1428481 ] WebGUI::HTTP::setFilename not working correctly in 6.8.5
- fix [ 1423608 ] Bug in Data Form in v6.8.5
- fix [ 1423324 ] Delete locked asset
- fix [ 1415743 ] Collab reply count includes old versions
- fix [ 1429299 ] RTE Collateral Functions Break when Prev Proxy Cache On
- fixed a bug where uploaded files would give an Auth Required regardless of
the user being in the view group or not (Martin Kamerbeek / Procolix)
6.8.5
- fix [ 1396957 ] Insufficient privileges check on the DataForm

9
www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html vendored
View file

@ -31,8 +31,13 @@ function Init() {
if(document.getElementById("dpicheck")) {
dpi = document.getElementById("dpicheck").width;
}
document.getElementById("lister").src = pageURL + '?op=richEditImageTree&DPI=' + dpi;
document.getElementById("viewer").src = pageURL + '?op=richEditViewThumbnail&DPI=' + dpi;
//Check for proper get delimiter
var seperator = '';
if (pageURL.match(/\?/)) { seperator = ';' } else { seperator = '?'}
document.getElementById("lister").src = pageURL + seperator + 'op=richEditImageTree&DPI=' + dpi;
document.getElementById("viewer").src = pageURL + seperator + 'op=richEditViewThumbnail&DPI=' + dpi;
var txtFileName = document.getElementById("txtFileName");

7
www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js vendored
View file

@ -22,8 +22,11 @@ function TinyMCE_pagetree_execCommand(editor_id, element, command, user_interfac
var template = new Array();
//alert(getWebguiProperty("pageURL"));
template['file'] = "../../../../../.." + getWebguiProperty ("pageURL") + '?op=richEditPageTree';
//Check for proper get delimiter
var seperator = '';
if (getWebguiProperty ("pageURL").match(/\?/)) { seperator = ';' } else { seperator = '?'}
template['file'] = "../../../../../.." + getWebguiProperty ("pageURL") + seperator + 'op=richEditPageTree';
// alert(template['file']);
template['width'] = 500;