[Fmsystem-commits] [14835] Merge 14830:14834 from trunk

[Sigurd Nes]

Revision: 14835
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14835
Author:   sigurdne
Date:     2016-03-14 14:07:31 +0000 (Mon, 14 Mar 2016)
Log Message:
-----------
Merge 14830:14834 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/booking/inc/class.uimetasettings.inc.php
    branches/Version-2_0-branch/booking/templates/base/metasettings.xsl
    branches/Version-2_0-branch/phpgwapi/inc/class.log.inc.php
    branches/Version-2_0-branch/phpgwapi/inc/class.xslttemplates.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/
    branches/Version-2_0-branch/booking/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834


Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829
   + /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834

Modified: branches/Version-2_0-branch/booking/inc/class.uimetasettings.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uimetasettings.inc.php        
2016-03-14 14:04:48 UTC (rev 14834)
+++ branches/Version-2_0-branch/booking/inc/class.uimetasettings.inc.php        
2016-03-14 14:07:31 UTC (rev 14835)
@@ -24,7 +24,6 @@
                {
                        $config = CreateObject('phpgwapi.config', 'booking');
                        $config->read();
-       _debug_array($config->config_data['frontpagetext']);
 
                        if ($_SERVER['REQUEST_METHOD'] == 'POST')
                        {
@@ -59,4 +58,4 @@
                {
 
                }
-       }
\ No newline at end of file
+       }

Modified: branches/Version-2_0-branch/booking/templates/base/metasettings.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/metasettings.xsl 
2016-03-14 14:04:48 UTC (rev 14834)
+++ branches/Version-2_0-branch/booking/templates/base/metasettings.xsl 
2016-03-14 14:07:31 UTC (rev 14835)
@@ -31,7 +31,7 @@
                                                </label>
                                                <div class="pure-custom">
                                                        <textarea 
id="field_frontpagetext" class="full-width" name="frontpagetext">
-                                                               <xsl:value-of 
select="config_data/frontpagetext"/>
+                                                               <xsl:value-of 
disable-output-escaping="yes" select="config_data/frontpagetext"/>
                                                        </textarea>
                                                </div>
                                        </div>

Modified: branches/Version-2_0-branch/phpgwapi/inc/class.log.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.log.inc.php  2016-03-14 
14:04:48 UTC (rev 14834)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.log.inc.php  2016-03-14 
14:07:31 UTC (rev 14835)
@@ -280,13 +280,15 @@
                                }
 
 
-                               $message = '<h1>' . lang('Fatal Error') . 
"</h1>\n"
-                                       . "<h2>{$msg}</h2>\n"
+                               $message = '<h1>' . lang('Fatal Error') . 
"</h1>\n";
+                               if (ini_get('display_errors'))
+                               {
+                                       $message .= "<h2>{$msg}</h2>\n"
                                        . '<p>' . lang('file') . ': ' . 
$err->fname . "<br>\n"
                                        . lang('line') . ': ' . $err->line . 
"</p>\n"
                                        . $trace;
+                               }
 
-
                                if(phpgw::get_var('phpgw_return_as') == 'json')
                                {
                                        echo json_encode($message);

Modified: branches/Version-2_0-branch/phpgwapi/inc/class.xslttemplates.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.xslttemplates.inc.php        
2016-03-14 14:04:48 UTC (rev 14834)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.xslttemplates.inc.php        
2016-03-14 14:07:31 UTC (rev 14835)
@@ -257,6 +257,12 @@
        <!DOCTYPE xsl:stylesheet [
                <!ENTITY nl "&#10;">
                <!ENTITY nbsp "&#160;">
+               <!ENTITY AElig "&#198;">
+               <!ENTITY aelig "&#230;">
+               <!ENTITY Oslash "&#216;">
+               <!ENTITY oslash "&#248;">
+               <!ENTITY Aring "&#197;">
+               <!ENTITY aring "&#229;">
                ]>
        <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0"
                xmlns:phpgw="http://phpgroupware.org/functions";