Permalink
Browse files

Correct merge issue.

Something weird happened when merging beta with master.
  • Loading branch information...
1 parent b2e7583 commit 6d9fc564efcfa68390fdfa24ee5e0517c1607d8e Michael Sisk committed Aug 22, 2012
Showing with 1 addition and 12 deletions.
  1. +1 −12 webcomic.php
View
@@ -1004,16 +1004,6 @@ private function log_ipn() {
if ( isset( $_GET[ 'webcomic_commerce_ipn' ] ) and !empty( $_POST ) ) {
do_action( 'webcomic_ipn' );
-<<<<<<< HEAD
- foreach ( $size as $s ) {
- if ( empty( $files[ $s ][ $k ] ) )
- continue;
-
- $output[ $s ][ $k ] = array_merge( ( array ) getimagesize( ( ( 'full' == $s ) ? $abs : $tabs ) . $files[ $s ][ $k ] ), pathinfo( ( ( 'full' == $s ) ? $abs : $tabs ) . $files[ $s ][ $k ] ) );
- $output[ $s ][ $k ][ 'url' ] = $output[ $s ][ $k ][ 'surl' ] = ( ( 'full' == $s ) ? $url : $turl ) . $files[ $s ][ $k ];
-
- $obj = ( 'application/x-shockwave-flash' == $output[ $s ][ $k ][ 'mime' ] ) ? str_replace( '%des', $des, str_replace( '%alt', $alt, str_replace( '%size', $s, str_replace( '%width', $output[ $s ][ $k ][ 0 ], str_replace( '%height', $output[ $s ][ $k ][ 1 ], str_replace( '%uid', hash( 'md5', $output[ $s ][ $k ][ 'url' ] ), $flash ) ) ) ) ) ) : str_replace( '%des', $des, str_replace( '%alt', $alt, str_replace( '%size', $s, str_replace( '%heightwidth', $output[ $s ][ $k ][ 3 ], str_replace( '%uid', hash( 'md5', $output[ $s ][ $k ][ 'url' ] ), $image ) ) ) ));
-=======
$output = array();
$header = $message = $error = '';
$logfile = self::$dir . sprintf( '-/log/ipn-%s.php', $blog_id ? $blog_id : 1 );
@@ -1127,7 +1117,6 @@ private function log_ipn() {
$error = true;
$message = __( 'Invalid response', 'webcomic' );
}
->>>>>>> beta
curl_close( $curl );
} else {
@@ -1330,4 +1319,4 @@ public static function config() {
require_once '-/php/admin.php'; new WebcomicAdmin;
} else { // Instantiate the standard class.
new Webcomic;
-}
+}

0 comments on commit 6d9fc56

Please sign in to comment.