Skip to content

Commit 701856c

Browse files
committed
[UPDATE] Improved php5.3 compatibility with debug info
1 parent c5a9626 commit 701856c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

litespeed-cache/admin/tpl/settings_cdn.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
</tr>
2323

2424
<tr>
25-
<th><?php echo __( 'Original URL', 'litespeed-cache' ) ; ?></th>
25+
<th><?php echo __( 'CDN URL', 'litespeed-cache' ) ; ?></th>
2626
<td>
27-
<?php $this->build_input( LiteSpeed_Cache_Config::OPID_CDN_ORI, 'litespeed-input-long' ) ; ?>
27+
<?php $this->build_input( LiteSpeed_Cache_Config::OPID_CDN_URL, 'litespeed-input-long' ) ; ?>
2828
<div class="litespeed-desc">
29-
<?php echo sprintf( __( 'Site URL to be served through the CDN. Beginning with %1$s. For example, %2$s', 'litespeed-cache' ), '<code>//</code>', '<code>' . $home_url . '</code>' ) ; ?>
29+
<?php echo sprintf( __( 'CDN URL to be used. For example, %s', 'litespeed-cache' ), '<code>' . $cdn_url . '</code>' ) ; ?>
3030
</div>
3131
</td>
3232
</tr>
3333

3434
<tr>
35-
<th><?php echo __( 'CDN URL', 'litespeed-cache' ) ; ?></th>
35+
<th><?php echo __( 'Original URL', 'litespeed-cache' ) ; ?></th>
3636
<td>
37-
<?php $this->build_input( LiteSpeed_Cache_Config::OPID_CDN_URL, 'litespeed-input-long' ) ; ?>
37+
<?php $this->build_input( LiteSpeed_Cache_Config::OPID_CDN_ORI, 'litespeed-input-long' ) ; ?>
3838
<div class="litespeed-desc">
39-
<?php echo sprintf( __( 'CDN URL to be used. For example, %s', 'litespeed-cache' ), '<code>' . $cdn_url . '</code>' ) ; ?>
39+
<?php echo sprintf( __( 'Site URL to be served through the CDN. Beginning with %1$s. For example, %2$s', 'litespeed-cache' ), '<code>//</code>', '<code>' . $home_url . '</code>' ) ; ?>
4040
</div>
4141
</td>
4242
</tr>

litespeed-cache/includes/litespeed-cache-log.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public static function push( $msg, $backtrace_limit = false )
206206
{
207207
// backtrace handler
208208
if ( defined( 'LSCWP_LOG_MORE' ) && $backtrace_limit !== false ) {
209-
$trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, $backtrace_limit + 2 ) ;
209+
$trace = version_compare( PHP_VERSION, '5.4.0', '<' ) ? debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ) : debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, $backtrace_limit + 2 ) ;
210210
for ( $i=1 ; $i <= $backtrace_limit + 1 ; $i++ ) {// the 0st item is push()
211211
if ( empty( $trace[$i]['class'] ) ) {
212212
break ;

0 commit comments

Comments
 (0)