Commit 4bca83be authored by Damien McKenna's avatar Damien McKenna
Browse files

Issue #2553077 by DamienMcKenna: Option to disable loading the bundled views.

parent 1943f10e

CHANGELOG.txt

+1 −0
Changes for CHANGELOG.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ By DamienMcKenna: Misspelling of "Twitter" in twitter.pages.inc. 
#2214867 by DamienMcKenna: Added index on {twitter}.created_time.

#1911494 by DamienMcKenna, Sheldon Rampton: Don't assume twitter_connect() works

  every time, identify failures.

#2553077 by DamienMcKenna: Option to disable loading the bundled views.





Twitter 7.x-5.8, 2013-06-03

twitter.install

+2 −1
Changes for twitter.install: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ function twitter_install() { 
 * Implements hook_uninstall().

 */

function twitter_uninstall() {

  // Remove variables

  // Remove variables.

  variable_del('twitter_import');

  variable_del('twitter_expire');

  variable_del('twitter_consumer_key');
@@ -362,6 +362,7 @@ function twitter_uninstall() { 
  variable_del('twitter_api');

  variable_del('twitter_search');

  variable_del('twitter_tinyurl');

  variable_del('twitter_use_default_views');

}



/**

twitter.pages.inc

+12 −2
Changes for twitter.pages.inc: 12 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -8,12 +8,16 @@ 
 * Twitter settings form.

 */

function twitter_admin_form($form, &$form_state) {

  $form['twitter_import'] = array(

  $form['misc'] = array(

    '#type' => 'fieldset',

    '#title' => t('Miscellaneous settings'),

  );

  $form['misc']['twitter_import'] = array(

    '#type' => 'checkbox',

    '#title' => t('Import and display the Twitter statuses of site users who have entered their Twitter account information.'),

    '#default_value' => variable_get('twitter_import', 1),

  );

  $form['twitter_expire'] = array(

  $form['misc']['twitter_expire'] = array(

    '#type' => 'select',

    '#title' => t('Delete old statuses'),

    '#default_value' => variable_get('twitter_expire', 0),
@@ -24,6 +28,12 @@ function twitter_admin_form($form, &$form_state) { 
      ),

    ),

  );

  $form['misc']['twitter_use_default_views'] = array(

    '#type' => 'checkbox',

    '#title' => t('Use default views'),

    '#description' => t('The module includes custom displays managed by the Views module. Disabling this option will remove the bundled views provided by the Twitter module, allowing them to be more easily customized and exported.'),

    '#default_value' => variable_get('twitter_use_default_views', TRUE),

  );



  $form['oauth'] = array(

    '#type' => 'fieldset',

twitter.views_default.inc

+4 −0
Changes for twitter.views_default.inc: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 
 * Default views for Twitter module.

 */

function twitter_views_default_views() {

  if (!variable_get('twitter_use_default_views', TRUE)) {

    return;

  }



  $view = new view();

  $view->name = 'tweets';

  $view->description = 'Displays Twitter.com status messages for users who have associated Twitter accounts.';