1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00
Commit Graph

6652 Commits

Author SHA1 Message Date
1ee4702ec5 [ticket/11179] remove extra & in function call
PHPBB3-11179
2013-02-19 00:52:56 +05:30
38bb7dca31 [ticket/11179] correct start parameter in sphinx search
PHPBB3-11179
2013-02-19 00:52:55 +05:30
2ff874fe93 [ticket/11179] correct start parameter in native author search
PHPBB3-11179
2013-02-19 00:52:54 +05:30
a0ae223ef4 [ticket/11179] correct start parameter in native keyword search
PHPBB3-11179
2013-02-19 00:52:53 +05:30
8b7f306897 [ticket/11179] fix success query path for postgres
Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
2013-02-19 00:52:52 +05:30
f0d63594e6 [ticket/11179] fix success query path for mysql
Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
2013-02-19 00:52:51 +05:30
16bbdf4a52 [ticket/11179] minor fixes
Amends comments to start with capitals. Reinsert blank lines which were
not supposed to be removed

PHPBB3-11179
2013-02-19 00:52:50 +05:30
bc77ca4d4e [ticket/11179] pass start param by reference in postgres
PHPBB3-11179
2013-02-19 00:52:49 +05:30
ef88edbcf6 [ticket/11179] correct start param in author search of postgres
PHPBB3-11179
2013-02-19 00:52:48 +05:30
2cb48f0341 [ticket/11179] correct start parameter in psql keyword search
PHPBB3-11179
2013-02-19 00:52:47 +05:30
80f8e3abce [ticket/11179] pass start param by reference in author search
PHPBB3-11179
2013-02-19 00:52:46 +05:30
2601411a9c [ticket/11179] correct start parameter for author search
PHPBB3-11179
2013-02-19 00:52:45 +05:30
1c9c666ef1 [ticket/11179] use FOUND_ROWS query to re-search with changed start param
PHPBB3-11179
2013-02-19 00:52:44 +05:30
3e5ef8ab2c [ticket/11179] pass start parameter by reference
start parameter is passed by reference so that in case it is not in bounds
the changes made to it are reflected back to the phpBB/search.php file

PHPBB3-11179
2013-02-19 00:52:43 +05:30
00d34617cc [ticket/11179] correct the start parameter while retrieving from cache
Start parameter if not between 0 and the total result count of the cached
search results is changed accordingly

PHPBB3-11179
2013-02-19 00:52:42 +05:30
737b99966d [ticket/11179] add search query in case initial one fails
changes the start parameter according to the total search results and
executes the search query again to get the results.

PHPBB3-11179
2013-02-19 00:52:41 +05:30
38360c71f2 [ticket/11359] html escape sphinx config data
PHPBB3-11359
2013-02-18 14:13:31 +05:30
3c6256b3e7 [ticket/11359] add id attribute to textarea
PHPBB3-11359
2013-02-18 14:05:25 +05:30
5b99f0c113 [ticket/11359] close span
PHPBB3-11359
2013-02-18 14:01:46 +05:30
9a5263c63c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11196] Changed 401 response message in session.php.
2013-02-12 23:06:17 +01:00
8ec55b062d [ticket/11196] Changed 401 response message in session.php.
In session.php 401 response message was "Not Authorized".
I changed it to "Unauthorized".

PHPBB3-11196
2013-02-12 23:04:55 +01:00
fa33eae556 Merge remote-tracking branch 'exreaction/ticket/11350' into develop
* exreaction/ticket/11350:
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
2013-02-07 00:56:31 +01:00
daf243026a [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
PHPBB3-11350
2013-02-06 13:08:35 -06:00
effaef6bdd Merge remote-tracking branch 'EXreaction/feature/migrations' into develop
* EXreaction/feature/migrations: (48 commits)
  [feature/migrations] Remove default values from necessary parameters
  [feature/migrations] Revert unrelated changes to functions.php
  [ticket/9737] Fix some comments
  [ticket/9737] Fix a few minor things in migrations
  [feature/migrations] Make sure migration data not done before running data step
  [feature/migrations] Function to populate the migrations table (for install)
  [feature/migrations] Function effectively_installed() in migrations
  [feature/migrations] Make load_migrations recursive (optionally)
  [feature/migrations] Make the test depends_on methods static
  [feature/migrations] Make depends_on static to call it without dependencies
  [feature/migrations] install/database_update_migrations.php
  [feature/migrations] Move test.php -> install/database_update_migrations.php
  [feature/migrations] Store depends on in the database (serialized)
  [feature/migrations] Revert method completed
  [feature/migrations] Basic reverting test
  [feature/migrations] Test for calling a step multiple times
  [feature/migrations] Creating revert method to attempt reverting a migration
  [feature/migrations] Some comments in db_tools
  [feature/migrations] Reverse data functionality
  [feature/migrations] Comment
  ...

Conflicts:
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/sqlite_schema.sql
2013-02-06 12:25:13 -05:00
77df9109b6 [feature/migrations] Remove default values from necessary parameters
Clean up some comments

PHPBB3-9737
2013-02-04 13:46:23 -06:00
336187151a [ticket/11201] Revert WLM dropping because it is still used in China.
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.

This commit reverts commits
 - 460470229d
 - 9affd6f7e7
which have been merged by d59431691c.

PHPBB3-11201
2013-02-04 01:31:43 +01:00
01045a6bb0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
2013-01-31 00:32:39 +01:00
75244eafd9 [feature/migrations] Revert unrelated changes to functions.php
PHPBB3-9737
2013-01-30 16:20:50 -06:00
36b7d7560e [ticket/11233] prohibit selecting anonymous user as a PM recipient
While composing pm, it should not be allowed to add
anonymous user as a PM recipient

PHPBB3-11233
2013-01-30 21:46:15 +05:30
2df2f27b96 Merge PR #1219 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
2013-01-27 17:46:11 -05:00
5a146df07f [ticket/11343] Remove spare parentheses.
PHPBB3-11343
2013-01-25 19:52:02 +01:00
8421aa0b0e [ticket/11343] Remove spare space.
PHPBB3-11343
2013-01-25 19:51:17 +01:00
305b2b8f48 [ticket/11343] Use === when checking stored user_actkey against user input.
Use strict comparison when checking whether stored user_actkey is equal to user
input.

PHPBB3-11343
2013-01-25 19:49:02 +01:00
7338bfe3f0 [ticket/9737] Fix some comments
PHPBB3-9737
2013-01-23 09:45:20 -06:00
dfabdbca50 [ticket/9737] Fix a few minor things in migrations
PHPBB3-9737
2013-01-22 13:19:49 -06:00
6a972da4c7 [ticket/9492] Fix typo in SQL query
PHPBB3-9492
2013-01-20 20:58:46 +01:00
9a6219d8b3 [ticket/9492] Ensure to delete the avatar/rank data when we change it
PHPBB3-9492
2013-01-17 14:45:40 +01:00
bd87b06858 [ticket/9492] Ensure to update all avatar values when the avatar is changed
PHPBB3-9492
2013-01-17 14:43:00 +01:00
64c27013d4 [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
PHPBB3-9492
2013-01-17 14:40:58 +01:00
3122aeff26 [ticket/9492] Retain custom ranks and avatars when setting users default group
PHPBB3-9492
2013-01-17 14:32:15 +01:00
e9a3f09074 Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympus
# By Sajaki
# Via Sajaki
* remotes/Sajaki/ticket/10854:
  [ticket/10854] sql server drop default constraint when dropping column
2013-01-15 22:24:58 -06:00
28e0520fe4 Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop
# By Sajaki
# Via Sajaki
* remotes/Sajaki/ticket/10854:
  [ticket/10854] sql server drop default constraint when dropping column
2013-01-15 22:22:06 -06:00
d59431691c Merge remote-tracking branch 'remotes/nickv/ticket/11201' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11201:
  [ticket/11201] Remove database column on update
  [ticket/11201] Remove MSN/WLM fields
2013-01-15 18:54:11 -06:00
a2f6e494f3 Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
  [ticket/11171] Moved the DB schema changes to its place
  [ticket/11171] Cleanup of leftovers
  [ticket/11171] Adapted the code in report.php
  [ticket/11171] Use the options stored to decide how to show it
  [ticket/11171] DB changes for the update
  [ticket/11171] DB additions for these changes

Conflicts:
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/sqlite_schema.sql
2013-01-14 12:16:59 -06:00
ccd08e21f6 [feature/migrations] Make sure migration data not done before running data step
PHPBB3-9737
2013-01-13 13:34:16 -06:00
000b8fefd2 [feature/migrations] Function to populate the migrations table (for install)
PHPBB3-9737
2013-01-13 13:21:01 -06:00
26c16559c3 [feature/migrations] Function effectively_installed() in migrations
Allows you to check if the migration is effectively installed
(entirely optionall)

This function is intended to help moving to migrations from a
previous database updater, where some migrations may have been
installed already even though they are not yet listed in the
migrations table.

PHPBB3-9737
2013-01-13 12:39:08 -06:00
93f9ebbb25 [feature/migrations] Make load_migrations recursive (optionally)
PHPBB3-9737
2013-01-12 18:27:33 -06:00
9affd6f7e7 [ticket/11201] Remove MSN/WLM fields
WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.

PHPBB3-11201
2013-01-11 14:32:44 +01:00
db4fcab3bb [feature/migrations] Make depends_on static to call it without dependencies
PHPBB3-11318
2013-01-10 22:29:49 -06:00