WordPress.org
Get WordPress

Plugin Directory

Changeset 543137


Ignore:
Timestamp:
05/11/2012 10:39:40 PM (14 years ago)
Author:
clintonb11
Message:

Merge branch 'master' of bitbucket.org:clintberry/dell-widget into cloudcomputing

File:
1 edited

Legend:

Unmodified
Added
Removed

  • dell-cloud-connect/trunk/connect.php

    r543134 r543137  
    5454
    5555    //Get option to see if it has already been installed
    56     $clientId = get_option('edu_connect_clientid', null);
     56    $clientId = get_option('dell_connect_clientid', null);
    5757       
    5858    //Set global default option
    … …  
    6767        $clientId = $settings->data->id;
    6868    }
    69     update_option('edu_connect_clientid', $clientId);
     69    update_option('dell_connect_clientid', $clientId);
    7070    update_option('edu_connect_showlink', true);
    7171}
    7272
    7373function dell_connect_uninstall() {
    74     $clientId = get_option('edu_connect_clientid', null);
     74    $clientId = get_option('dell_connect_clientid', null);
    7575    $settings = file_get_contents(DELL_CONNECT_SERVICE_URL . '/client/deactivate?clientid=' . $clientId);
    7676    $settings = json_decode($settings);
    … …  
    170170        $count_items = $instance['count_items'];
    171171        $show_descriptions = $instance['show_descriptions'];
    172         $clientId = get_option('edu_connect_clientid', null);
     172        $clientId = get_option('dell_connect_clientid', null);
    173173        ?>
    174174        <?php echo $before_widget; ?>
    … …  
    183183            <?php endif; ?>
    184184            _dec.push(['setBaseUrl', '<?php echo DELL_CONNECT_SERVICE_URL ?>']);
    185             _dec.push(['setClientId', '<?php echo get_option("edu_connect_clientid")?>']);
     185            _dec.push(['setClientId', '<?php echo get_option("dell_connect_clientid")?>']);
    186186            _dec.push(['setDivision', '<?php echo DELL_CONNECT_DIVISION ?>']);
    187187            _dec.push(['getFeed',<?php echo (int)$count_items; ?>,<?php echo (($show_descriptions)?'true':'false'); ?>]);
    … …  
    278278            <?php endif; ?>
    279279            _dec.push(['setBaseUrl', '<?php echo DELL_CONNECT_SERVICE_URL ?>']);
    280             _dec.push(['setClientId', '<?php echo get_option("edu_connect_clientid")?>']);
     280            _dec.push(['setClientId', '<?php echo get_option("dell_connect_clientid")?>']);
    281281            _dec.push(['setDivision', '<?php echo DELL_CONNECT_DIVISION ?>']);
    282282            _dec.push(['getBlogList']);
Note: See TracChangeset for help on using the changeset viewer.