Changeset 394409

Timestamp:

06/08/2011 01:52:45 AM (15 years ago)

Author:

sivel

Message:

Missed merge

File:

• shadowbox-js/tags/3.0.3.6/inc/frontend.php (modified) (4 diffs)

shadowbox-js/tags/3.0.3.6/inc/frontend.php

@@ -40 +40 @@
             // Automatically add Shadowbox to links
             if ( $this->is_automatic ( 'any' ) ) {
-                add_filter ( 'the_posts' , array ( &$this , 'process_posts_early' ) , 10 , 2 );
+                if ( $this->get_option ( 'smartLoad' ) == 'false' )
+                    add_filter ( 'the_content', array ( &$this, 'add_attr_to_link' ) , 12 , 2 );
+                else
+                    add_filter ( 'the_posts' , array ( &$this , 'process_posts_early' ) , 10 , 2 );
                 add_filter ( 'wp_get_attachment_link' , array ( &$this , 'add_attr_to_link' ) , 12 , 2 );
             }
@@ -187 +190 @@
         $plugin_url = $this->plugin_url();
         $library = $this->get_option ( 'library' );
-        $start =  "\n<!-- Begin Shadowbox JS -->\n";
+        $start =  "\n<!-- Begin Shadowbox JS v{$this->version} -->\n";
         $start .= "<!-- Selected Players: " . implode ( ', ', (array) $this->get_option ( 'players' ) ) . " -->\n";
         $end = "<!-- End Shadowbox JS -->\n\n";
@@ -211 +214 @@
         // The full Shadowbox configuration
         $init  = "<script type=\"text/javascript\">\n";
-        $init .= "//<![CDATA[\n";
+        $init .= "/* <![CDATA[ */\n";
         $init .= "  var shadowbox_conf = {\n";
         $init .= rtrim ( $init_opts , " ,\n" ) . "\n";
         $init .= "  };\n";
         $init .= "  Shadowbox.init(shadowbox_conf);\n";
-        $init .= "//]]>\n";
+        $init .= "/* ]]> */\n";
         $init .= "</script>\n";
 
@@ -254 +257 @@
 
         // Set the album ID, if the image is coming from a gallery use the gallery ID, otherwise use the ID of the post
-        if ( is_object( $post_or_id ) ) {
+        if ( is_object ( $post_or_id ) ) {
             $albumid = "sbpost-{$post_or_id->ID}";
-        } elseif ( is_int( $post_or_id ) && $post_or_id != 0 ) {
+        } elseif ( is_int ( $post_or_id ) && $post_or_id != 0 ) {
             $p = get_post ( $post_or_id );
             $albumid = "sbalbum-{$p->post_parent}";
         } else {
-            $albumid = "sbgroup-" . time();
+            global $post;
+            if ( isset ( $post) && is_object ( $post ) && is_int ( $post->ID ) )
+                $albumid = "sbpost-{$post->ID}";
+            else
+                $albumid = "sbgroup-" . time();
         }