| @@ -429,20 +429,22 @@ | ||
| 429 | 429 | } |
| 430 | 430 | |
| 431 | 431 | /** @todo Include Debuging info only if we're in debuging mode! */ |
| 432 | 432 | if ( 1 ) { |
| 433 | - // CODE UPDATED BY RBJ -- START | |
| 434 | - if (trim($evaluatedCode) != ''): | |
| 435 | - global $post; | |
| 436 | - $checkMetaBlock = get_post_meta($post->ID, '__CJT-BLOCK-ID', true); | |
| 433 | + if (trim($evaluatedCode) != ''): | |
| 434 | + global $post; | |
| 435 | + // Defensive: $post may be null in some contexts, avoid reading ->ID on null. | |
| 436 | + $checkMetaBlock = null; | |
| 437 | + if ( isset($post) && is_object($post) && isset($post->ID) ) { | |
| 438 | + $checkMetaBlock = get_post_meta($post->ID, '__CJT-BLOCK-ID', true); | |
| 439 | + } | |
| 437 | 440 | |
| 438 | - if (!empty($checkMetaBlock) && $checkMetaBlock == $blockId): | |
| 439 | - $evaluatedCode = "\n\n<!-- CJT Meta Block ({$blockId}) - {$block->name} - START -->\n{$evaluatedCode}\n<!-- CJT Meta Block ({$blockId}) - {$block->name} - END -->\n\n"; | |
| 440 | - else: | |
| 441 | - $evaluatedCode = "\n\n<!-- CJT Global Block ({$blockId}) - {$block->name} - START -->\n{$evaluatedCode}\n<!-- CJT Global Block ({$blockId}) - {$block->name} - END -->\n\n"; | |
| 442 | - endif; | |
| 443 | - endif; | |
| 444 | - // CODE UPDATED BY RBJ -- END | |
| 441 | + if (!empty($checkMetaBlock) && $checkMetaBlock == $blockId): | |
| 442 | + $evaluatedCode = "\n\n<!-- CJT Meta Block ({$blockId}) - {$block->name} - START -->\n{$evaluatedCode}\n<!-- CJT Meta Block ({$blockId}) - {$block->name} - END -->\n\n"; | |
| 443 | + else: | |
| 444 | + $evaluatedCode = "\n\n<!-- CJT Global Block ({$blockId}) - {$block->name} - START -->\n{$evaluatedCode}\n<!-- CJT Global Block ({$blockId}) - {$block->name} - END -->\n\n"; | |
| 445 | + endif; | |
| 446 | + endif; | |
| 445 | 447 | } |
| 446 | 448 | |
| 447 | 449 | // Initialize block LOCATION array for the first time |
| 448 | 450 | if (!isset($this->blocks[ 'code' ][ $block->location ])) { |
| @@ -522,9 +524,11 @@ | ||
| 522 | 524 | $port = ($_SERVER["SERVER_PORT"] != "80") ? ":{$_SERVER["SERVER_PORT"]}" : ''; |
| 523 | 525 | // Request URI. |
| 524 | 526 | $requestURI = $_SERVER['REQUEST_URI']; |
| 525 | 527 | // Final URL. |
| 526 | - $url = "{$protocol}{$host}{$port}{$requestURI}"; | |
| 528 | + //$url = "{$protocol}{$host}{$port}{$requestURI}"; | |
| 529 | + // Removing port segment from the URL as it is causing bugs. | |
| 530 | + $url = "{$protocol}{$host}{$requestURI}"; | |
| 527 | 531 | return $url; |
| 528 | 532 | } |
| 529 | 533 | |
| 530 | 534 | /** |
