Merge remote-tracking branch 'origin/master' into drizzle

Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php

1 files changed, 6 insertions, 6 deletions

diff --git a/db_search.php b/db_search.php
index 3f3c7cc5e7..3ec891cdef 100644
--- a/db_search.php
+++ b/db_search.php
@@ -92,7 +92,7 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) {
  */
 $sub_part = '';
 
-if( $GLOBALS['is_ajax_request'] != true) {
+if ( $GLOBALS['is_ajax_request'] != true) {
     require './libraries/db_info.inc.php';
     echo '<div id="searchresults">';
 }
@@ -113,10 +113,10 @@ if (isset($_REQUEST['submit_search'])) {
      * explode
      * count
      * strlen
-     * @param   string   the table name
-     * @param   string   restrict the search to this field
-     * @param   string   the string to search
-     * @param   integer  type of search (1 -> 1 word at least, 2 -> all words,
+     * @param string   the table name
+     * @param string   restrict the search to this field
+     * @param string   the string to search
+     * @param integer  type of search (1 -> 1 word at least, 2 -> all words,
      *                                   3 -> exact string, 4 -> regexp)
      *
      * @return  array    3 SQL querys (for count, display and delete results)
@@ -262,7 +262,7 @@ if (isset($_REQUEST['submit_search'])) {
 /**
  * If we are in an Ajax request, we need to exit after displaying all the HTML
  */
-if($GLOBALS['is_ajax_request'] == true) {
+if ($GLOBALS['is_ajax_request'] == true) {
     exit;
 }
 else {