Changeset 678:d07dada561e2 for inc/public/lib.tpl.context.php

Timestamp:

08/11/11 19:35:09 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Message:

Fixes #1271

File:

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

inc/public/lib.tpl.context.php

@@ -342 +342 @@
      public static function EntryFirstImageHelper($size,$with_category,$class="")
      {
-          if (!preg_match('/^sq|t|s|m|o$/',$size)) {
+          global $core, $_ctx;
+          
+          if (!$core->media) $core->media = new dcMedia($core);
+          $sizes = implode('|',array_keys($core->media->thumb_sizes)).'|o';
+          if (!preg_match('/^'.$sizes.'$/',$size)) {
                $size = 's';
           }
-          
-          global $core, $_ctx;
           
           $p_url = $core->blog->settings->system->public_url;
@@ -400 +402 @@
      private static function ContentFirstImageLookup($root,$img,$size)
      {
+          global $core;
+          
           # Get base name and extension
           $info = path::info($img);
           $base = $info['base'];
           
-          if (preg_match('/^\.(.+)_(sq|t|s|m)$/',$base,$m)) {
+          if (!$core->media) $core->media = new dcMedia($core);
+          $sizes = implode('|',array_keys($core->media->thumb_sizes));
+          if (preg_match('/^\.(.+)_('.$sizes.')$/',$base,$m)) {
                $base = $m[1];
           }