steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include mysmarty.php, 1.11, 1.12
cvs at intevation.de
cvs at intevation.de
Mon Nov 28 03:27:35 CET 2005
- Previous message: martin: server/kolabd/kolabd ChangeLog, 1.3, 1.4 kolab.in, 1.1, 1.2 kolab_bootstrap.in, 1.7, 1.8 kolab_ca.sh.in, 1.1, 1.2 kolab_smtpdpolicy.in, 1.4, 1.5 kolab_upgrade.in, 1.1, 1.2 kolabcheckperm.in, 1.1, 1.2 kolabconf.in, 1.1, 1.2 kolabd.in, 1.2, 1.3 kolabpasswd.in, 1.3, 1.4 kolabquotawarn.in, 1.4, 1.5
- Next message: steffen: server/kolabd/kolabd kolab_smtpdpolicy.in,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv29109/kolab-webadmin/php/admin/include
Modified Files:
mysmarty.php
Log Message:
Simplified and corrected patch from Fabio that prevents the URL from growing when languages are switched multiple times.
Index: mysmarty.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mysmarty.php 13 Oct 2005 08:38:49 -0000 1.11
+++ mysmarty.php 28 Nov 2005 02:27:33 -0000 1.12
@@ -46,11 +46,13 @@
$this->assign( 'topdir', $topdir );
$this->assign( 'self_url', $_SERVER['REQUEST_URI'] );
- $this->assign( 'lang_url',
- strpos($_SERVER['REQUEST_URI'],'?')===false?
- ($_SERVER['REQUEST_URI'].'?lang='):
- ($_SERVER['REQUEST_URI'].'&lang=') );
+ $cleanurl = preg_replace('/(\?|&)lang=(.*)(&|$)/', '', $_SERVER['REQUEST_URI']);
+ $this->assign( 'lang_url',
+ strpos($cleanurl,'?')===false?
+ ($cleanurl.'?lang='):
+ ($cleanurl.'&lang=') );
+
// If you add a translation,
// add the new language here
$this->assign( 'currentlang', $language );
- Previous message: martin: server/kolabd/kolabd ChangeLog, 1.3, 1.4 kolab.in, 1.1, 1.2 kolab_bootstrap.in, 1.7, 1.8 kolab_ca.sh.in, 1.1, 1.2 kolab_smtpdpolicy.in, 1.4, 1.5 kolab_upgrade.in, 1.1, 1.2 kolabcheckperm.in, 1.1, 1.2 kolabconf.in, 1.1, 1.2 kolabd.in, 1.2, 1.3 kolabpasswd.in, 1.3, 1.4 kolabquotawarn.in, 1.4, 1.5
- Next message: steffen: server/kolabd/kolabd kolab_smtpdpolicy.in,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list