Changeset 529508 for shadowbox-js/trunk/inc/admin.php

Timestamp:

04/10/2012 03:25:36 PM (14 years ago)

Author:

sivel

Message:

Fix issue with 3.0.3.10 where the FLV player could not be found due to a URL change, and make sure we get rid of the missing file nag if the source files were manually downloaded. Bump to 3.0.3.10.1 and tag for release.

File:

• shadowbox-js/trunk/inc/admin.php (modified) (4 diffs)

shadowbox-js/trunk/inc/admin.php

@@ -418 +418 @@
         }
         //$this->build_shadowbox ( true ); // Attempt to build and cache shadowbox.js
-        if ( ! $this->check_for_src_file () )
-            update_option ( 'shadowbox-js-missing-src', true );
+        $this->check_for_src_file ();
     }
 
@@ -493 +492 @@
             $status = false;
 
-        if ( $status === false )
+        $option = get_option( 'shadowbox-js-missing-src' );
+
+        if ( $status === false && ! $option )
             update_option ( 'shadowbox-js-missing-src', true );
+        else if ( $status === true && $option )
+            update_option ( 'shadowbox-js-missing-src', false );
 
         return $status;
@@ -601 +604 @@
 
         $uploads = wp_upload_dir ();
-        if ( empty( $uploads['error'] ) && ! empty( $uploads['basedir'] ) )
+        if ( empty( $uploads['error'] ) && ! empty( $uploads['basedir'] ) ) {
+            $baseurl = $uploads['baseurl'];
             $basedir = $uploads['basedir'];
-        else
+        } else {
+            $baseurl = WP_CONTENT_URL . '/uploads';
             $basedir = WP_CONTENT_DIR . '/uploads';
+        }
 
         $shadowbox_dir = "$basedir/shadowbox-js/";
         $shadowbox_src_dir = "{$shadowbox_dir}src";
+        $shadowbox_src_url = "{$baseurl}/shadowbox-js/src";
 
         // Ouput correct content-type, and caching headers
@@ -623 +630 @@
                 // Replace S.path with the correct path, so we don't have to rely on autodetection which is broken with this method
                 if ( $include == 'core' )
-                    $output .= str_replace ( 'S.path=null;' , "S.path='$plugin_url/shadowbox/';" , file_get_contents ( "$shadowbox_src_dir/$include.js" ) );
+                    $output .= str_replace ( 'S.path=null;' , "S.path='{$shadowbox_src_url}/';" , file_get_contents ( "$shadowbox_src_dir/$include.js" ) );
                 else
-                    $output .= file_get_contents ( "$shadowbox_src_dir/$include.js" );
+                    $output .= file_get_contents ( "{$shadowbox_src_dir}/{$include}.js" );
             }
 
             $library = $this->get_option ( 'library' );
-            $output .= file_get_contents ( "$shadowbox_src_dir/adapters/$library.js" );
+            $output .= file_get_contents ( "{$shadowbox_src_dir}/adapters/{$library}.js" );
 
             foreach ( array ( 'load' , 'plugins' , 'cache' ) as $include )
-                $output .= file_get_contents ( "$shadowbox_src_dir/$include.js" );
+                $output .= file_get_contents ( "{$shadowbox_src_dir}/{$include}.js" );
 
             if ( $this->get_option ( 'useSizzle' ) == 'true' && $this->get_option ( 'library' ) != 'jquery' )
-                $output .= file_get_contents ( "$shadowbox_src_dir/find.js" );
+                $output .= file_get_contents ( "{$shadowbox_src_dir}/find.js" );
 
             $players = (array) $this->get_option ( 'players' );
             if ( in_array ( 'flv' , $players ) || in_array ( 'swf' , $players ) )
-                $output .= file_get_contents ( "$shadowbox_src_dir/flash.js" );
+                $output .= file_get_contents ( "{$shadowbox_src_dir}/flash.js" );
 
             $language = $this->get_option ( 'language' );
-            $output .= file_get_contents ( "$shadowbox_src_dir/languages/$language.js" );
+            $output .= file_get_contents ( "{$shadowbox_src_dir}/languages/{$language}.js" );
 
             foreach ( $players as $player )
-                $output .= file_get_contents ( "$shadowbox_src_dir/players/$player.js" );
+                $output .= file_get_contents ( "{$shadowbox_src_dir}/players/{$player}.js" );
 
             foreach ( array ( 'skin' , 'outro' ) as $include )
-                $output .= file_get_contents ( "$shadowbox_src_dir/$include.js" );
+                $output .= file_get_contents ( "{$shadowbox_src_dir}/{$include}.js" );
 
             wp_cache_set ( $this->md5 () , 'shadowbox-js' );