mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 06:20:46 +02:00
Merge in r8758, r8807, r8808, r8809
git-svn-id: file:///svn/phpbb/trunk@8810 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -215,7 +215,7 @@ class dbal_firebird extends dbal
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($this->query_result) ? $this->query_result : false;
|
||||
return $this->query_result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -157,7 +157,7 @@ class dbal_mssql extends dbal
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($this->query_result) ? $this->query_result : false;
|
||||
return $this->query_result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -173,7 +173,7 @@ class dbal_mssql_odbc extends dbal
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($this->query_result) ? $this->query_result : false;
|
||||
return $this->query_result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -173,7 +173,7 @@ class dbal_mysql extends dbal
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($this->query_result) ? $this->query_result : false;
|
||||
return $this->query_result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -169,7 +169,7 @@ class dbal_mysqli extends dbal
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($this->query_result) ? $this->query_result : false;
|
||||
return $this->query_result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -357,7 +357,7 @@ class dbal_oracle extends dbal
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($this->query_result) ? $this->query_result : false;
|
||||
return $this->query_result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -198,7 +198,7 @@ class dbal_postgres extends dbal
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($this->query_result) ? $this->query_result : false;
|
||||
return $this->query_result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -143,7 +143,7 @@ class dbal_sqlite extends dbal
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($this->query_result) ? $this->query_result : false;
|
||||
return $this->query_result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -418,7 +418,7 @@ class ucp_profile
|
||||
|
||||
$now = getdate();
|
||||
$s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>';
|
||||
for ($i = $now['year'] - 100; $i < $now['year']; $i++)
|
||||
for ($i = $now['year'] - 100; $i <= $now['year']; $i++)
|
||||
{
|
||||
$selected = ($i == $data['bday_year']) ? ' selected="selected"' : '';
|
||||
$s_birthday_year_options .= "<option value=\"$i\"$selected>$i</option>";
|
||||
|
Reference in New Issue
Block a user