Changeset 923:171d086f9f7e

Timestamp:

10/27/12 16:08:43 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with windows directory separator, should fixes #1094, thanks adjaya

File:

• inc/public/lib.tpl.context.php (modified) (2 diffs)

inc/public/lib.tpl.context.php

@@ -368 +368 @@
                     foreach ($m[1] as $i => $img) {
                          if (($src = self::ContentFirstImageLookup($p_root,$img,$size)) !== false) {
-                              $src = $p_url.(dirname($img) != '/' ? dirname($img) : '').'/'.$src;
+                              $dirname = str_replace('\\', '/', dirname($img)); 
+                              $src = $p_url.($dirname != '/' ? $dirname : '').'/'.$src;
                               if (preg_match('/alt="([^"]+)"/',$m[0][$i],$malt)) {
                                    $alt = $malt[1];
@@ -385 +386 @@
                     foreach ($m[1] as $i => $img) {
                          if (($src = self::ContentFirstImageLookup($p_root,$img,$size)) !== false) {
-                              $src = $p_url.(dirname($img) != '/' ? dirname($img) : '').'/'.$src;
+                              $dirname = str_replace('\\', '/', dirname($img)); 
+                              $src = $p_url.($dirname != '/' ? $dirname : '').'/'.$src;
                               if (preg_match('/alt="([^"]+)"/',$m[0][$i],$malt)) {
                                    $alt = $malt[1];