[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] folders/phplayersmenu/lib/layersmenu-common.inc.php,
From: |
nomail |
Subject: |
[Phpgroupware-cvs] folders/phplayersmenu/lib/layersmenu-common.inc.php, 1.3 |
Date: |
Thu, 20 May 2004 21:23:33 -0000 |
Update of /folders/phplayersmenu/lib
Modified Files:
Branch:
layersmenu-common.inc.php
date: 2004/04/23 09:34:44; author: fipsfuchs; state: Exp; lines: +2 -2
Log Message:
merge with 0.9.16 branch
=====================================================================
No syntax errors detected in -
=====================================================================
Index: folders/phplayersmenu/lib/layersmenu-common.inc.php
diff -u folders/phplayersmenu/lib/layersmenu-common.inc.php:1.2
folders/phplayersmenu/lib/layersmenu-common.inc.php:1.3
--- folders/phplayersmenu/lib/layersmenu-common.inc.php:1.2 Mon Nov 24
16:46:53 2003
+++ folders/phplayersmenu/lib/layersmenu-common.inc.php Fri Apr 23 09:34:44 2004
@@ -275,7 +275,7 @@
if ($libjsdir != "" && substr($libjsdir, -1) != "/") {
$libjsdir .= "/";
}
- if ($libjsdir == "" || substr($libjsdir, 0, 1) != "/") {
+ if (($libjsdir == "") || ((substr($libjsdir,0,1) != "/") &&
(substr($libjsdir,1,1) != ":"))) {
$foobar = strpos($libjsdir, $this->dirroot);
if ($foobar === false || $foobar != 0) {
$libjsdir = $this->dirroot . $libjsdir;
@@ -298,7 +298,7 @@
if ($imgdir != "" && substr($imgdir, -1) != "/") {
$imgdir .= "/";
}
- if ($imgdir == "" || substr($imgdir, 0, 1) != "/") {
+ if (($imgdir == "") || ((substr($imgdir,0,1) != "/") &&
(substr($imgdir,1,1) != ":"))) {
$foobar = strpos($imgdir, $this->dirroot);
if ($foobar === false || $foobar != 0) {
$imgdir = $this->dirroot . $imgdir;
- [Phpgroupware-cvs] folders/phplayersmenu/lib/layersmenu-common.inc.php, 1.3,
nomail <=