Changeset 2416

Timestamp:

07/01/10 16:34:44 (13 years ago)

Author:

philippe

Message:

colorbox : fixed notices with new settings

Location:

plugins/colorbox

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (3 diffs)

plugins/colorbox/_define.php

@@ -14 +14 @@
      /* Name */               "colorbox",
      /* Description*/         "ColorBox like effect on images using jquery ColorBox plugin",
-     /* Author */             "Philippe aka amalgame and contributors",
-     /* Version */            '1.3.7',
+     /* Author */             "Philippe aka amalgame and Tomtom",
+     /* Version */            '1.3.8',
      /* Permissions */        'admin'
 );

plugins/colorbox/_public.php

@@ -45 +45 @@
           if ($s->colorbox_user_files) {
                $public_path = $core->blog->public_path;
-               $public_url = $core->blog->settings->public_url;       
+               $public_url = $core->blog->settings->system->public_url;         
                $colorbox_user_path = $public_path.'/colorbox/themes/';
                $colorbox_user_url = $public_url.'/colorbox/themes/';
@@ -56 +56 @@
                }
           } else {
-               $theme_path = path::fullFromRoot($core->blog->settings->themes_path."/".$core->blog->settings->theme,DC_ROOT);;
-               $theme_url = $core->blog->settings->themes_url."/".$core->blog->settings->theme;
+               $theme_path = path::fullFromRoot($core->blog->settings->system->themes_path."/".$core->blog->settings->system->theme,DC_ROOT);;
+               $theme_url = $core->blog->settings->system->themes_url."/".$core->blog->settings->system->theme;
                $colorbox_user_path = $theme_path.'/colorbox/themes/'.$s->colorbox_theme.'/colorbox_user.css';
                $colorbox_user_url = $theme_url.'/colorbox/themes/'.$s->colorbox_theme.'/colorbox_user.css';
@@ -63 +63 @@
                echo
                     '<style type="text/css">'."\n".
-                    #'@import url('.$theme_url.'/colorbox_'.$s->colorbox_theme.'/colorbox_user.css);'."\n".
                     '@import url('.$colorbox_user_url.');'."\n".
                     "</style>\n";