Disqus Comment System - Version 2.42

Version Description

Download this release

Release Info

Developer Disqus
Plugin Icon Disqus Comment System
Version 2.42
Comparing to
See all releases

Code changes from version 2.41 to 2.42

Files changed (5) hide show
  1. comments.php +1 -1
  2. disqus.php +19 -2
  3. lib/wpapi.php +1 -1
  4. manage.php +12 -7
  5. readme.txt +8 -1
comments.php CHANGED
@@ -42,7 +42,7 @@
42
  var disqus_container_id = 'disqus_thread';
43
  var disqus_domain = '<?php echo DISQUS_DOMAIN; ?>';
44
  var disqus_shortname = '<?php echo strtolower(get_option('disqus_forum_url')); ?>';
45
- var disqus_title = <?php echo json_encode(dsq_title_for_post($post)); ?>;
46
  <?php if (false && get_option('disqus_developer')): ?>
47
  var disqus_developer = 1;
48
  <?php endif; ?>
42
  var disqus_container_id = 'disqus_thread';
43
  var disqus_domain = '<?php echo DISQUS_DOMAIN; ?>';
44
  var disqus_shortname = '<?php echo strtolower(get_option('disqus_forum_url')); ?>';
45
+ var disqus_title = <?php echo cf_json_encode(dsq_title_for_post($post)); ?>;
46
  <?php if (false && get_option('disqus_developer')): ?>
47
  var disqus_developer = 1;
48
  <?php endif; ?>
disqus.php CHANGED
@@ -4,11 +4,11 @@ Plugin Name: Disqus Comment System
4
  Plugin URI: http://disqus.com/
5
  Description: The Disqus comment system replaces your WordPress comment system with your comments hosted and powered by Disqus. Head over to the Comments admin page to set up your DISQUS Comment System.
6
  Author: Disqus <team@disqus.com>
7
- Version: 2.41
8
  Author URI: http://disqus.com/
9
  */
10
 
11
- require_once('lib/wpapi.php');
12
 
13
  define('DISQUS_URL', 'http://disqus.com/');
14
  define('DISQUS_API_URL', DISQUS_URL . 'api/');
@@ -18,6 +18,20 @@ define('DISQUS_MEDIA_URL', 'http://disqus.com/media/');
18
  define('DISQUS_RSS_PATH', '/latest.rss');
19
  define('DISQUS_CAN_EXPORT', is_file(dirname(__FILE__) . '/export.php'));
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
  function dsq_plugin_basename($file) {
22
  $file = dirname($file);
23
 
@@ -107,6 +121,9 @@ $DSQ_QUERY_POST_IDS = array();
107
  * Helper functions.
108
  */
109
 
 
 
 
110
  function dsq_is_installed() {
111
  return get_option('disqus_forum_url') && get_option('disqus_api_key');
112
  }
4
  Plugin URI: http://disqus.com/
5
  Description: The Disqus comment system replaces your WordPress comment system with your comments hosted and powered by Disqus. Head over to the Comments admin page to set up your DISQUS Comment System.
6
  Author: Disqus <team@disqus.com>
7
+ Version: 2.42
8
  Author URI: http://disqus.com/
9
  */
10
 
11
+ require_once(dirname(__FILE__) . '/lib/wpapi.php');
12
 
13
  define('DISQUS_URL', 'http://disqus.com/');
14
  define('DISQUS_API_URL', DISQUS_URL . 'api/');
18
  define('DISQUS_RSS_PATH', '/latest.rss');
19
  define('DISQUS_CAN_EXPORT', is_file(dirname(__FILE__) . '/export.php'));
20
 
21
+ /**
22
+ * Returns an array of all option identifiers used by DISQUS.
23
+ */
24
+ function dsq_options() {
25
+ return array(
26
+ 'disqus_forum_url',
27
+ 'disqus_api_key',
28
+ 'disqus_user_api_key',
29
+ 'disqus_partner_key',
30
+ 'disqus_replace',
31
+ 'disqus_cc_fix',
32
+ );
33
+ }
34
+
35
  function dsq_plugin_basename($file) {
36
  $file = dirname($file);
37
 
121
  * Helper functions.
122
  */
123
 
124
+ /**
125
+ * Tests if required options are configured to display the Disqus embed.
126
+ */
127
  function dsq_is_installed() {
128
  return get_option('disqus_forum_url') && get_option('disqus_api_key');
129
  }
lib/wpapi.php CHANGED
@@ -11,7 +11,7 @@
11
  */
12
 
13
  require_once(ABSPATH.WPINC.'/http.php');
14
- require_once('api/disqus/disqus.php');
15
  /** @#+
16
  * Constants
17
  */
11
  */
12
 
13
  require_once(ABSPATH.WPINC.'/http.php');
14
+ require_once(dirname(__FILE__) . '/api/disqus/disqus.php');
15
  /** @#+
16
  * Constants
17
  */
manage.php CHANGED
@@ -28,10 +28,9 @@ if( isset($_POST['export']) and DISQUS_CAN_EXPORT ) {
28
 
29
  // Handle uninstallation.
30
  if ( isset($_POST['uninstall']) ) {
31
- update_option('disqus_forum_url', '');
32
- update_option('disqus_api_key', '');
33
- update_option('disqus_user_api_key', '');
34
- update_option('disqus_partner_key', '');
35
  }
36
 
37
  // Clean-up POST parameters.
@@ -49,6 +48,7 @@ if ( isset($_POST['dsq_forum']) && isset($_POST['dsq_user_api_key']) ) {
49
  dsq_manage_dialog(dsq_i('There was an error completing the installation of Disqus. If you are still having issues, refer to the <a href="http://disqus.com/help/wordpress">WordPress help page</a>.'), true);
50
  } else {
51
  update_option('disqus_api_key', $api_key);
 
52
  update_option('disqus_replace', 'all');
53
  }
54
 
@@ -188,7 +188,7 @@ case 0:
188
  $dsq_replace = get_option('disqus_replace');
189
  $dsq_forum_url = strtolower(get_option('disqus_forum_url'));
190
  $dsq_api_key = get_option('disqus_api_key');
191
- $dsq_user_api_key = get_option('dsq_user_api_key');
192
  $dsq_partner_key = get_option('disqus_partner_key');
193
  $dsq_cc_fix = get_option('disqus_cc_fix');
194
  ?>
@@ -290,11 +290,16 @@ case 0:
290
  <p><?php echo dsq_i('Having problems with the plugin? <a href="%s">Drop us a line</a> and include the following details and we\'ll do what we can.', 'mailto:help+wp@disqus.com'); ?></p>
291
  <textarea style="width:90%; height:200px;">URL: <?php echo get_option('siteurl'); ?>
292
  Version: <?php echo $wp_version; ?>
 
293
 
294
  Plugin Version: <?php echo $dsq_version; ?>
295
- Forum Shortname: <?php echo get_option('disqus_forum_url'); ?>
296
 
297
- Active Theme: <?php $theme = get_theme(get_current_theme()); echo $theme['Name'].' '.$theme['Version']; ?>
 
 
 
 
 
298
 
299
  Plugins:
300
 
28
 
29
  // Handle uninstallation.
30
  if ( isset($_POST['uninstall']) ) {
31
+ foreach (dsq_options() as $opt) {
32
+ delete_option($opt);
33
+ }
 
34
  }
35
 
36
  // Clean-up POST parameters.
48
  dsq_manage_dialog(dsq_i('There was an error completing the installation of Disqus. If you are still having issues, refer to the <a href="http://disqus.com/help/wordpress">WordPress help page</a>.'), true);
49
  } else {
50
  update_option('disqus_api_key', $api_key);
51
+ update_option('disqus_user_api_key', $_POST['dsq_user_api_key']);
52
  update_option('disqus_replace', 'all');
53
  }
54
 
188
  $dsq_replace = get_option('disqus_replace');
189
  $dsq_forum_url = strtolower(get_option('disqus_forum_url'));
190
  $dsq_api_key = get_option('disqus_api_key');
191
+ $dsq_user_api_key = get_option('disqus_user_api_key');
192
  $dsq_partner_key = get_option('disqus_partner_key');
193
  $dsq_cc_fix = get_option('disqus_cc_fix');
194
  ?>
290
  <p><?php echo dsq_i('Having problems with the plugin? <a href="%s">Drop us a line</a> and include the following details and we\'ll do what we can.', 'mailto:help+wp@disqus.com'); ?></p>
291
  <textarea style="width:90%; height:200px;">URL: <?php echo get_option('siteurl'); ?>
292
  Version: <?php echo $wp_version; ?>
293
+ Active Theme: <?php $theme = get_theme(get_current_theme()); echo $theme['Name'].' '.$theme['Version']; ?>
294
 
295
  Plugin Version: <?php echo $dsq_version; ?>
 
296
 
297
+ Settings:
298
+
299
+ dsq_is_installed: <?php echo dsq_is_installed(); ?>
300
+ <? foreach (dsq_options() as $opt) {
301
+ echo $opt.': '.get_option($opt)."\n";
302
+ } ?>
303
 
304
  Plugins:
305
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: disqus, alexkingorg, crowdfavorite
3
  Tags: comments, threaded, email, notification, spam, avatars, community, profile, widget
4
  Requires at least: 2.8
5
  Tested up to: 3.0
6
- Stable tag: 2.41
7
 
8
  The Disqus comment system replaces your WordPress comment system with your comments hosted and powered by Disqus.
9
 
@@ -62,6 +62,13 @@ you should remove it, and the new plugin should be stored in 'disqus'.
62
 
63
  == Changes ==
64
 
 
 
 
 
 
 
 
65
  2.41
66
 
67
  * Correct a bug with double urlencoding titles.
3
  Tags: comments, threaded, email, notification, spam, avatars, community, profile, widget
4
  Requires at least: 2.8
5
  Tested up to: 3.0
6
+ Stable tag: 2.42
7
 
8
  The Disqus comment system replaces your WordPress comment system with your comments hosted and powered by Disqus.
9
 
62
 
63
  == Changes ==
64
 
65
+ 2.42
66
+
67
+ * Correct a bug with saving disqus_user_api_key (non-critical).
68
+ * Added settings to Debug Information.
69
+ * Adjusting all includes to use absolute paths.
70
+ * Adjusted JSON usage to solve a problem for some clients.
71
+
72
  2.41
73
 
74
  * Correct a bug with double urlencoding titles.