makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
15413 commits 18 branches 192 tags 206 MiB
Commit graph

13999 commits

Author SHA1 Message Date
Nils Adermann
e2046444a1 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11361] Make sure that array passed to strtr() has the proper format.

Conflicts:
	phpBB/includes/session.php
 2013-02-24 17:58:27 +01:00
Nils Adermann
639110766c Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympus 
* github-bantu/ticket/11361:
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
 2013-02-24 17:50:04 +01:00
Nils Adermann
d2a15d9afe [ticket/10896] Add missing email validation lost in develop merge 
Fix incomplete merge, by adding a piece of code moved to another file in
olympus back.

PHPBB3-10896
 2013-02-24 17:42:53 +01:00
Nils Adermann
5361a14c1e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
	phpBB/language/en/ucp.php
 2013-02-24 17:42:14 +01:00
Nils Adermann
678ec7b545 Merge remote-tracking branch 'github-exreaction/ticket/10896' into develop-olympus 
* github-exreaction/ticket/10896:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP
 2013-02-24 17:39:04 +01:00
Nils Adermann
0fdbdd01fb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
 2013-02-24 17:37:38 +01:00
Nils Adermann
f29bebc7ce Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympus 
* github-bantu/ticket/11122:
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
 2013-02-24 17:37:32 +01:00
Nils Adermann
54f34dd26f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/7262] Add note about set_config() not updating is_dynamic.
  [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
  [ticket/7262] Backport set_config() and set_config_count() docs from develop.

Conflicts:
	phpBB/includes/functions.php
 2013-02-24 17:33:41 +01:00
Andreas Fischer
6bf64d5620 [ticket/7262] Add note about set_config() not updating is_dynamic. 
PHPBB3-7262
 2013-02-24 13:39:48 +01:00
Andreas Fischer
a9037a68c1 [ticket/7262] Add $is_dynamic example to set_config() and set_config_count(). 
The logic is the other way around here in comparison to develop's
phpbb_config_db class, so add examples to make things more clear.

PHPBB3-7262
 2013-02-24 13:08:00 +01:00
Andreas Fischer
e8b3e8498d [ticket/7262] Backport set_config() and set_config_count() docs from develop. 
PHPBB3-7262
 2013-02-24 13:07:37 +01:00
Andreas Fischer
c69b1c2ef2 [ticket/11122] Move rxu to 'Former Contributors' section. 
PHPBB3-11122
 2013-02-24 12:43:31 +01:00
Andreas Fischer
c4f8c64a23 [ticket/11122] Add EXreaction to docs/AUTHORS. 
PHPBB3-11122
 2013-02-24 12:37:02 +01:00
David King
b7a222cdd5 [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION 
PHPBB3-11298
 2013-02-23 14:20:56 -05:00
David King
6e1e62a77d Merge remote-tracking branch 'EXreaction/feature/migrations-extensions' into develop 
# By Nathaniel Guse (6) and Nathan Guse (3)
# Via Nathan Guse (1) and Nathaniel Guse (1)
* EXreaction/feature/migrations-extensions:
  [feature/migrations] Use getLocalisedMessage() function to get error message
  [feature/migrations] Fix failing tests (again)
  [feature/migrations] Fix failing tests
  [feature/migrations] Catch and display errors from the migrator
  [feature/migrations] Call revert correctly when purging an extension
  [feature/migrations] Inject Migrator instead of using the container to fetch
  [feature/migrations] Fix path to extension migrations
  [feature/migrations] Automatically install/revert migrations for extensions
  [feature/migrations] Make the container available to extension installers
 2013-02-23 14:08:48 -05:00
David King
0987efa189 Merge remote-tracking branch 'EXreaction/ticket/11351' into develop 
# By Nathaniel Guse (4) and Nathan Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11351:
  [feature/migrations] getLocalisedMessage function for migration exception
  [feature/migrations] Fix unfulfillable function
  [feature/migrations] getParameters function for migration exception
  [feature/migrations] Add explanatory language string for migration errors
  [feature/migrations] Add language strings for migrations errors
 2013-02-23 13:50:53 -05:00
Andreas Fischer
ae3a22bd0c [ticket/11361] Make sure that array passed to strtr() has the proper format. 
The array $date_cache[$format]['lang'] passed to strtr() contains a sub-array
which results in an E_NOTICE being thrown for 'Array to string conversion' on
PHP 5.4.
Ensure that the array passed to strtr() is one-dimensional by filtering out
non-string values.

PHPBB3-11361
 2013-02-23 11:06:48 +01:00
Dhruv
1ee4702ec5 [ticket/11179] remove extra & in function call 
PHPBB3-11179
 2013-02-19 00:52:56 +05:30
Dhruv
38bb7dca31 [ticket/11179] correct start parameter in sphinx search 
PHPBB3-11179
 2013-02-19 00:52:55 +05:30
Dhruv
2ff874fe93 [ticket/11179] correct start parameter in native author search 
PHPBB3-11179
 2013-02-19 00:52:54 +05:30
Dhruv
a0ae223ef4 [ticket/11179] correct start parameter in native keyword search 
PHPBB3-11179
 2013-02-19 00:52:53 +05:30
Dhruv
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
Dhruv
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
Dhruv
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
Dhruv
bc77ca4d4e [ticket/11179] pass start param by reference in postgres 
PHPBB3-11179
 2013-02-19 00:52:49 +05:30
Dhruv
ef88edbcf6 [ticket/11179] correct start param in author search of postgres 
PHPBB3-11179
 2013-02-19 00:52:48 +05:30
Dhruv
2cb48f0341 [ticket/11179] correct start parameter in psql keyword search 
PHPBB3-11179
 2013-02-19 00:52:47 +05:30
Dhruv
80f8e3abce [ticket/11179] pass start param by reference in author search 
PHPBB3-11179
 2013-02-19 00:52:46 +05:30
Dhruv
2601411a9c [ticket/11179] correct start parameter for author search 
PHPBB3-11179
 2013-02-19 00:52:45 +05:30
Dhruv
1c9c666ef1 [ticket/11179] use FOUND_ROWS query to re-search with changed start param 
PHPBB3-11179
 2013-02-19 00:52:44 +05:30
Dhruv
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
Dhruv
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
Dhruv
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
Dhruv
38360c71f2 [ticket/11359] html escape sphinx config data 
PHPBB3-11359
 2013-02-18 14:13:31 +05:30
Dhruv
3c6256b3e7 [ticket/11359] add id attribute to textarea 
PHPBB3-11359
 2013-02-18 14:05:25 +05:30
Dhruv
5b99f0c113 [ticket/11359] close span 
PHPBB3-11359
 2013-02-18 14:01:46 +05:30
Nathan Guse
872773a218 [feature/migrations] Use getLocalisedMessage() function to get error message 
PHPBB3-11318
 2013-02-15 22:22:13 -06:00
Nathan Guse
f6bb14569b [feature/migrations] getLocalisedMessage function for migration exception 
PHPBB3-11351
 2013-02-15 22:19:24 -06:00
Andreas Fischer
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
erangamapa
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
Nathaniel Guse
f9a1b27a99 [feature/migrations] Fix unfulfillable function 
Returned unfulfillable name in the wrong place previously

PHPBB3-11351
 2013-02-09 21:16:39 -06:00
Nathaniel Guse
f18b096df9 [feature/migrations] getParameters function for migration exception 
PHPBB3-11351
 2013-02-09 21:10:56 -06:00
Nathaniel Guse
b398fa2050 [feature/migrations] Catch and display errors from the migrator 
PHPBB3-11318
 2013-02-09 21:09:29 -06:00
Nathaniel Guse
f409697137 [feature/migrations] Add explanatory language string for migration errors 
This should be used if an exception is thrown to inform the user of
what occurred.

PHPBB3-11351
 2013-02-09 21:06:08 -06:00
Nathaniel Guse
cacaffee6e [feature/migrations] Add language strings for migrations errors 
Unfulfillable returns string of the missing dependency name now if
the migration is unfulfillable (this is significantly more helpful).

PHPBB3-11351
 2013-02-09 20:56:42 -06:00
Nathaniel Guse
fc4d5f74c0 [feature/migrations] Call revert correctly when purging an extension 
PHPBB3-11318
 2013-02-09 20:05:39 -06:00
Nathaniel Guse
a8da6b89e9 [feature/migrations] Inject Migrator instead of using the container to fetch 
PHPBB3-11318
 2013-02-09 20:01:40 -06:00
Nathaniel Guse
ec9328e943 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/migrations-extensions 
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
 2013-02-09 19:51:18 -06:00
Igor Wiedler
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
Nathaniel Guse
5705c3d377 [feature/migrations] Fix path to extension migrations 
PHPBB3-11318
 2013-02-06 13:14:40 -06:00