mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-15 18:38:57 +01:00
fix for bug [ 1006205 ] wiki editing broken with Safari
- safari gets now recogniced as browser by the html-class - html::htmlarea show's a textarea if HTMLarea is not availible (suppresses error with safari) - dont show button to convert to html if: * HTMLarea is not availible for the browser * admin disabled it in the wiki configuration
This commit is contained in:
parent
8d6c7367f1
commit
88f72fdd51
@ -249,8 +249,13 @@ class html
|
|||||||
*/
|
*/
|
||||||
function htmlarea($name,$content='',$style='',$base_href='',$plugins='')
|
function htmlarea($name,$content='',$style='',$base_href='',$plugins='')
|
||||||
{
|
{
|
||||||
if (!$plugins) $plugins = 'ContextMenu,TableOperations,SpellChecker';
|
|
||||||
if (!$style) $style = 'width:100%; min-width:500px; height:300px;';
|
if (!$style) $style = 'width:100%; min-width:500px; height:300px;';
|
||||||
|
// check if htmlarea is availible for the browser and use a textarea if not
|
||||||
|
if (!$this->htmlarea_availible())
|
||||||
|
{
|
||||||
|
return $this->textarea($name,$content,'style="'.$style.'"');
|
||||||
|
}
|
||||||
|
if (!$plugins) $plugins = 'ContextMenu,TableOperations,SpellChecker';
|
||||||
|
|
||||||
if (!is_object($GLOBALS['phpgw']->js))
|
if (!is_object($GLOBALS['phpgw']->js))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user