Merge pull request #1106 from ramiy/release/1.7

Fix admin_url() function usage
impress-org · Oct 10, 2016 · 7630a6f · 7630a6f
2 parents fc6133d + ecc3a35
commit 7630a6f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/includes/admin/class-admin-notices.php b/includes/admin/class-admin-notices.php
@@ -49,7 +49,7 @@ public function give_admin_bar_menu( $wp_admin_bar ) {
 		//Add the main siteadmin menu item.
 		$wp_admin_bar->add_menu( array(
 			'id'     => 'give-test-notice',
-			'href'   => admin_url() . 'edit.php?post_type=give_forms&page=give-settings&tab=gateways',
+			'href'   => admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=gateways' ),
 			'parent' => 'top-secondary',
 			'title'  => esc_html__( 'Give Test Mode Active', 'give' ),
 			'meta'   => array( 'class' => 'give-test-mode-active' ),

diff --git a/includes/admin/customers/class-customer-table.php b/includes/admin/customers/class-customer-table.php
@@ -114,7 +114,7 @@ public function column_default( $item, $column_name ) {
 
 			case 'num_purchases' :
 				$value = '<a href="' .
-				         admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
+				         admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
 				         ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
 				break;
 

diff --git a/includes/admin/dashboard-widgets.php b/includes/admin/dashboard-widgets.php
@@ -137,9 +137,16 @@ function give_dashboard_at_a_glance_widget( $items ) {
 		$text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
 
 		if ( current_user_can( 'edit_give_forms', get_current_user_id() ) ) {
-			$text = sprintf( '<a class="give-forms-count" href="edit.php?post_type=give_forms">%1$s</a>', $text );
+			$text = sprintf(
+				'<a class="give-forms-count" href="%1$s">%2$s</a>',
+				admin_url( 'edit.php?post_type=give_forms' ),
+				$text
+			);
 		} else {
-			$text = sprintf( '<span class="give-forms-count">%1$s</span>', $text );
+			$text = sprintf(
+				'<span class="give-forms-count">%1$s</span>',
+				$text
+			);
 		}
 
 		$items[] = $text;

diff --git a/includes/admin/payments/actions.php b/includes/admin/payments/actions.php
@@ -322,7 +322,7 @@ function give_trigger_purchase_delete( $data ) {
 		}
 
 		give_delete_purchase( $payment_id );
-		wp_redirect( admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&give-message=payment_deleted' ) );
+		wp_redirect( admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&give-message=payment_deleted' ) );
 		give_die();
 	}
 }

diff --git a/includes/admin/reporting/class-donor-reports-table.php b/includes/admin/reporting/class-donor-reports-table.php
@@ -173,7 +173,7 @@ public function column_default( $item, $column_name ) {
 
 			case 'num_purchases' :
 				$value = '<a href="' .
-				         admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
+				         admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
 				         ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
 				break;
 

diff --git a/includes/admin/welcome.php b/includes/admin/welcome.php
@@ -198,7 +198,7 @@ public function tabs() {
 			<a class="nav-tab <?php echo $selected == 'give-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-credits' ), 'index.php' ) ) ); ?>">
 				<?php esc_html_e( 'Credits', 'give' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'give-add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( null, 'index.php' ) ) . 'edit.php?post_type=give_forms&page=give-addons'; ?>">
+			<a class="nav-tab <?php echo $selected == 'give-add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-addons' ) ); ?>">
 				<?php esc_html_e( 'Add-ons', 'give' ); ?>
 			</a>
 		</h2>