Removed underscores from wp-cron events hooks, as per the codex

crowdfavorite · Jul 10, 2013 · 1bb9eec · 1bb9eec
1 parent 94a3bb5
commit 1bb9eec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/social/controller/cron.php b/lib/social/controller/cron.php
@@ -41,7 +41,7 @@ public function action_cron_15() {
 		Social::log('Attempting semaphore lock');
 		if ($semaphore->lock()) {
 			Social::log('Running social_cron_15_action.');
-			do_action('social_cron_15');
+			do_action('socialcron15');
 			$semaphore->unlock();
 		}
 	}
@@ -57,7 +57,7 @@ public function action_check_crons() {
 			Social::log('API key failed');
 			wp_die('Oops, invalid API key.');
 		}
-		
+
 		$crons = _get_cron_array();
 		$social_crons = array(
 			'15' => false,

diff --git a/lib/social/controller/settings.php b/lib/social/controller/settings.php
@@ -64,8 +64,8 @@ public function action_index() {
 				Social::option('cron', $this->request->post('social_cron'));
 
 				// Unschedule the CRONs
-				if ($this->request->post('social_cron') != '1' and ($timestamp = wp_next_scheduled('social_cron_15_init')) !== false) {
-					wp_unschedule_event($timestamp, 'social_cron_15_init');
+				if ($this->request->post('social_cron') != '1' and ($timestamp = wp_next_scheduled('socialcron15init')) !== false) {
+					wp_unschedule_event($timestamp, 'socialcron15init');
 				}
 			}
 

diff --git a/social.php b/social.php
@@ -489,9 +489,9 @@ public function check_system_cron() {
 		Social::log('Checking system CRON');
 		// Schedule CRONs
 		if (Social::option('cron') == '1') {
-			if (wp_next_scheduled('social_cron_15_init') === false) {
+			if (wp_next_scheduled('socialcron15init') === false) {
 				Social::log('Adding Social 15 CRON schedule');
-				wp_schedule_event(time() + 900, 'every15min', 'social_cron_15_init');
+				wp_schedule_event(time() + 900, 'every15min', 'socialcron15init');
 			}
 			wp_remote_get(
 				admin_url('options_general.php?'.http_build_query(array(
@@ -1203,7 +1203,7 @@ public function cron_schedules($schedules) {
 	/**
 	 * Sends a request to initialize CRON 15.
 	 *
-	 * @wp-action  social_cron_15_init
+	 * @wp-action  socialcron15init
 	 * @return void
 	 */
 	public function cron_15_init() {
@@ -1214,7 +1214,7 @@ public function cron_15_init() {
 	/**
 	 * Runs the aggregation loop.
 	 *
-	 * @wp-action  social_cron_15
+	 * @wp-action  socialcron15
 	 * @return void
 	 */
 	public function run_aggregation() {
@@ -2319,9 +2319,9 @@ function social_get_shortlink($post_id) {
 add_action('social_settings_save', array('Social_Service_Facebook', 'social_settings_save'));
 
 // CRON Actions
-add_action('social_cron_15_init', array($social, 'cron_15_init'));
+add_action('socialcron15init', array($social, 'cron_15_init'));
 if (Social::option('aggregate_comments')) {
-	add_action('social_cron_15', array($social, 'run_aggregation'));
+	add_action('socialcron15', array($social, 'run_aggregation'));
 }
 
 // Admin Actions