[Fmsystem-commits] [10027] API: fix partial urls

[Sigurd Nes]

Revision: 10027
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10027
Author:   sigurdne
Date:     2012-09-24 16:36:27 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
API: fix partial urls

Modified Paths:
--------------
    trunk/phpgwapi/inc/functions.inc.php

Modified: trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/functions.inc.php        2012-09-24 14:26:01 UTC (rev 
10026)
+++ trunk/phpgwapi/inc/functions.inc.php        2012-09-24 16:36:27 UTC (rev 
10027)
@@ -115,7 +115,6 @@
         * @param string $params on the format 'param1:value1,param2:value2'
         * @return string containing url
         */
-
        function get_phpgw_link($path, $params)
        {
                $link_data = array();
@@ -129,17 +128,21 @@
                                $link_data[trim($__param_set[0])] = 
trim($__param_set[1]);
                        }
                }
-/*
-_debug_array($path);
-_debug_array($link_data);
-_debug_array($GLOBALS['phpgw']->link($path, $link_data));
-*/
-               $ret = $GLOBALS['phpgw']->link($path, $link_data);
-               return str_replace('&', '&', $ret);
+               $ret = $GLOBALS['phpgw']->link($path, $link_data, true);
+               return $ret;
        }
 
+       /**
+        * Fix global phpgw_link from XSLT templates by adding session id and 
click_history
+        * @return string containing parts of url
+        */
+       function get_phpgw_session_url()
+       {
+               $base_url       = $GLOBALS['phpgw']->link('/', array(), true);
+               $url_parts = parse_url($base_url);
+               return $url_parts['query'];
+       }
 
-
        /**
        * cleans up a backtrace array and converts it to a string
        *