[Svn] r1771 - trunk/roundcubemail/program/include

[trac at roundcube.net]

Author: thomasb
Date: 2008-09-12 09:01:52 -0500 (Fri, 12 Sep 2008)
New Revision: 1771

Modified:
   trunk/roundcubemail/program/include/rcmail.php
Log:
Fix rcmail::url(), don't use comm_path

Modified: trunk/roundcubemail/program/include/rcmail.php
===================================================================
--- trunk/roundcubemail/program/include/rcmail.php	2008-09-12 13:50:35 UTC (rev 1770)
+++ trunk/roundcubemail/program/include/rcmail.php	2008-09-12 14:01:52 UTC (rev 1771)
@@ -891,17 +891,19 @@
   {
     if (!is_array($p))
       $p = array('_action' => @func_get_arg(0));
-    
-    if ($p['task'] && in_array($p['task'], rcmail::$main_tasks))
-      $url = './?_task='.$p['task'];
-    else
-      $url = $this->comm_path;
-    
-    unset($p['task']);
-    foreach ($p as $par => $val)
-      if (isset($val))
-        $url .= '&'.urlencode($par).'='.urlencode($val);
-    
+
+    if (!$p['task'] || !in_array($p['task'], rcmail::$main_tasks))
+      $p['task'] = $this->task;
+
+    $url = './';
+    $delm = '?';
+    foreach (array_reverse($p) as $par => $val)
+    {
+      if (!empty($val)) {
+        $url .= $delm.urlencode($par).'='.urlencode($val);
+        $delm = '&';
+      }
+    }
     return $url;
   }
 }

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn