Changeset 20105

Timestamp:

03/04/2012 01:16:32 AM (12 years ago)

Author:

nacin

Message:

Allow get_screenshots() to return absolute URLs. Make this the default; relative can be achieved with 'relative' as the argument. see #20103.

File:

• trunk/wp-includes/class-wp-theme.php (modified) (2 diffs)

trunk/wp-includes/class-wp-theme.php

@@ -792 +792 @@
      * @access public
      *
-     * @param string $uri Type of URL to include, either 'relative' or an absolute URI. Defaults to absolute URI.
+     * @param string $uri Type of URL to return, either 'relative' or an absolute URI. Defaults to absolute URI.
      * @return mixed Screenshot file. False if the theme does not have a screenshot.
      */
@@ -862 +862 @@
      * @access public
      *
-     * @return array Screenshots.
-     */
-    public function get_screenshots() {
+     * @param string $uri Type of URL to return, either 'relative' or an absolute URI. Defaults to absolute URI.
+     * @return array Screenshots. Empty array if no screenshors are found.
+     */
+    public function get_screenshots( $uri = 'uri' ) {
         if ( ! $count = $this->get_screenshot_count() )
             return array();
 
-        $screenshots = array( $this->get_screenshot( 'relative' ) );
+        $pre = 'relative' == $uri ? '' : $this->get_stylesheet_directory_uri() . '/';
+
+        $screenshots = array( $pre . $this->get_screenshot( 'relative' ) );
         for ( $i = 2; $i <= $count; $i++ )
-            $screenshots[] = 'screenshot-' . $i . '.png';
+            $screenshots[] = $pre . 'screenshot-' . $i . '.png';
         return $screenshots;
     }