WordPress.org
Get WordPress

Plugin Directory

Changeset 716006


Ignore:
Timestamp:
05/21/2013 12:22:18 PM (13 years ago)
Author:
randomaniac
Message:

Rename Flickr class to avoid name conflicts with other plugins.


Use home_url() instead of site_url() to account for non-root WP installations.


See ​http://wordpress.org/support/topic/version-11-triggers-fatal-error?replies=10

Location:
wp-flickr-embed/trunk
Files:
1 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • wp-flickr-embed/trunk/README.txt

    r715431 r716006  
    88Requires at least: 3.4.1
    99Tested up to: 3.4.1
    10 Stable tag: 1.2
     10Stable tag: 1.2.1
    1111
    1212== Description ==
    … …  
    6161== Changelog ==
    6262
     63= 1.2.1 (May 21, 2013) =
     64* Further bug fixes and improvements (see http://wordpress.org/support/topic/version-11-triggers-fatal-error)
     65
    6366= 1.2 (May 20, 2013) =
    6467* Fix two major issues (see http://wordpress.org/support/topic/version-11-triggers-fatal-error)

  • wp-flickr-embed/trunk/include/class.admin-page.php

    r715431 r716006  
    9191        <?php else: ?>
    9292            <p><?php _e('Please authorize access to your Flickr account if you want to be able to insert your private photos.', $this->_slug) ?></p>
    93             <form name="wpFlickrEmbed" method="get" action="<?php echo site_url() ?>">
     93            <form name="wpFlickrEmbed" method="get" action="<?php echo $wpFlickrEmbed->getSiteHomeUrl() ?>">
    9494                <input type="hidden"
    9595                       name="<?php echo self::FLICKR_AUTH_URL_PARAM_NAME ?>"

  • wp-flickr-embed/trunk/wp-flickr-embed.php

    r715431 r716006  
    55Description: Insert Flickr images into your post using an interactive popup, launched from the visual editor toolbar.
    66Author: Ramesh Nair
    7 Version: 1.2
     7Version: 1.2.1
    88Author URI: http://hiddentao.com
    99*/
    10 
    11 
    12 require_once(dirname(__FILE__).'/DPZ/Flickr.php');
    1310
    1411
    … …  
    9794        }
    9895
    99         $this->flickrAPI = new Flickr(
     96        $this->flickrAPI = new WpFlickrEmbed_Flickr(
    10097            self::FLICKR_API_KEY,
    10198            self::FLICKR_SECRET,
    … …  
    106103        if (!empty($this->settings[self::FLICKR_OAUTH_TOKEN])) {
    107104            $this->flickrAPI->useOAuthAccessCredentials(array(
    108                 Flickr::USER_FULL_NAME => $this->settings[self::FLICKR_USER_FULLNAME],
    109                 Flickr::USER_NAME => $this->settings[self::FLICKR_USER_NAME],
    110                 Flickr::USER_NSID => $this->settings[self::FLICKR_USER_NSID],
    111                 Flickr::OAUTH_ACCESS_TOKEN => $this->settings[self::FLICKR_OAUTH_TOKEN],
    112                 Flickr::OAUTH_ACCESS_TOKEN_SECRET => $this->settings[self::FLICKR_OAUTH_TOKEN_SECRET],
     105                WpFlickrEmbed_Flickr::USER_FULL_NAME => $this->settings[self::FLICKR_USER_FULLNAME],
     106                WpFlickrEmbed_Flickr::USER_NAME => $this->settings[self::FLICKR_USER_NAME],
     107                WpFlickrEmbed_Flickr::USER_NSID => $this->settings[self::FLICKR_USER_NSID],
     108                WpFlickrEmbed_Flickr::OAUTH_ACCESS_TOKEN => $this->settings[self::FLICKR_OAUTH_TOKEN],
     109                WpFlickrEmbed_Flickr::OAUTH_ACCESS_TOKEN_SECRET => $this->settings[self::FLICKR_OAUTH_TOKEN_SECRET],
    113110            ));
    114111        }
    … …  
    175172                // want flickr to come back here
    176173                $current_url = sprintf('%s?%s=%s',
    177                     trailingslashit(site_url()), self::FLICKR_AUTH_URL_PARAM_NAME, urlencode($wpfe_flickr_auth));
    178 
    179                 $this->flickrAPI = new Flickr(
     174                    trailingslashit($this->getSiteHomeUrl()), self::FLICKR_AUTH_URL_PARAM_NAME, urlencode($wpfe_flickr_auth));
     175
     176                $this->flickrAPI = new WpFlickrEmbed_Flickr(
    180177                    self::FLICKR_API_KEY,
    181178                    self::FLICKR_SECRET,
    … …  
    239236
    240237    public function getFlickrApiUrl() {
    241         return Flickr::API_ENDPOINT;
     238        return WpFlickrEmbed_Flickr::API_ENDPOINT;
    242239    }
    243240
    244241
    245242    public function getSignRequestApiUrl() {
    246         return sprintf('%s?%s=', trailingslashit(site_url()), self::SIGN_URL_PARAM_NAME);
     243        return sprintf('%s?%s=', trailingslashit($this->getSiteHomeUrl()), self::SIGN_URL_PARAM_NAME);
     244    }
     245
     246
     247    /**
     248     * Get website home URL.
     249     *
     250     * @return string
     251     */
     252    public function getSiteHomeUrl() {
     253        // if we're in SSL then request SSL version
     254        return home_url('', is_ssl() ? 'https' : 'http');
    247255    }
    248256
    … …  
    312320    function saveFlickrAuthentication() {
    313321        $this->update_settings(array(
    314             self::FLICKR_USER_FULLNAME => $this->flickrAPI->getOauthData(Flickr::USER_FULL_NAME),
    315             self::FLICKR_USER_NAME => $this->flickrAPI->getOauthData(Flickr::USER_NAME),
    316             self::FLICKR_USER_NSID => $this->flickrAPI->getOauthData(Flickr::USER_NSID),
    317             self::FLICKR_OAUTH_TOKEN => $this->flickrAPI->getOauthData(Flickr::OAUTH_ACCESS_TOKEN),
    318             self::FLICKR_OAUTH_TOKEN_SECRET => $this->flickrAPI->getOauthData(Flickr::OAUTH_ACCESS_TOKEN_SECRET),
     322            self::FLICKR_USER_FULLNAME => $this->flickrAPI->getOauthData(WpFlickrEmbed_Flickr::USER_FULL_NAME),
     323            self::FLICKR_USER_NAME => $this->flickrAPI->getOauthData(WpFlickrEmbed_Flickr::USER_NAME),
     324            self::FLICKR_USER_NSID => $this->flickrAPI->getOauthData(WpFlickrEmbed_Flickr::USER_NSID),
     325            self::FLICKR_OAUTH_TOKEN => $this->flickrAPI->getOauthData(WpFlickrEmbed_Flickr::OAUTH_ACCESS_TOKEN),
     326            self::FLICKR_OAUTH_TOKEN_SECRET => $this->flickrAPI->getOauthData(WpFlickrEmbed_Flickr::OAUTH_ACCESS_TOKEN_SECRET),
    319327        ));
    320328    }
Note: See TracChangeset for help on using the changeset viewer.