Hide query count if debug mode is false

Fixes YOURLS#2617
thutex · Mar 14, 2020 · d5b47a5 · d5b47a5
1 parent 352b427
commit d5b47a5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/includes/functions-html.php b/includes/functions-html.php
@@ -142,9 +142,9 @@ function yourls_html_head( $context = 'index', $title = '' ) {
  * @return void
  */
 function yourls_html_footer($can_query = true) {
-    if($can_query) {
+    if($can_query & yourls_get_debug_mode()) {
         $num_queries = yourls_get_num_queries();
-        $num_queries = sprintf( yourls_n( '1 query', '%s queries', $num_queries ), $num_queries );
+        $num_queries = ' &ndash; '. sprintf( yourls_n( '1 query', '%s queries', $num_queries ), $num_queries );
     } else {
         $num_queries = '';
     }
@@ -154,11 +154,11 @@ function yourls_html_footer($can_query = true) {
 	<footer id="footer" role="contentinfo"><p>
 		<?php
 		$footer  = yourls_s( 'Powered by %s', '<a href="http://yourls.org/" title="YOURLS">YOURLS</a> v ' . YOURLS_VERSION );
-		$footer .= ' &ndash; '.$num_queries;
+		$footer .= $num_queries;
 		echo yourls_apply_filter( 'html_footer_text', $footer );
 		?>
 	</p></footer>
-	<?php if( defined( 'YOURLS_DEBUG' ) && YOURLS_DEBUG == true ) {
+	<?php if( yourls_get_debug_mode() ) {
 		echo '<div style="text-align:left"><pre>';
 		echo join( "\n", yourls_get_debug_log() );
 		echo '</pre></div>';

diff --git a/includes/functions.php b/includes/functions.php
@@ -2245,7 +2245,7 @@ function yourls_deprecated_function( $function, $version, $replacement = null )
 	yourls_do_action( 'deprecated_function', $function, $replacement, $version );
 
 	// Allow plugin to filter the output error trigger
-	if ( YOURLS_DEBUG && yourls_apply_filter( 'deprecated_function_trigger_error', true ) ) {
+	if ( yourls_get_debug_mode() && yourls_apply_filter( 'deprecated_function_trigger_error', true ) ) {
 		if ( ! is_null( $replacement ) )
 			trigger_error( sprintf( yourls__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
 		else
@@ -2372,7 +2372,7 @@ function yourls_get_debug_log() {
 }
 
 /**
- * Debug mode toggle
+ * Debug mode set
  *
  * @since 1.7.3
  * @param bool $bool  Debug on or off
@@ -2392,6 +2392,16 @@ function yourls_debug_mode($bool) {
     }
 }
 
+/**
+ * Return YOURLS debug mode
+ *
+ * @since 1.7.7
+ * @return bool
+ */
+function yourls_get_debug_mode() {
+    return ( defined( 'YOURLS_DEBUG' ) && YOURLS_DEBUG == true );
+}
+
 /**
  * Explode a URL in an array of ( 'protocol' , 'slashes if any', 'rest of the URL' )
  *