Commit graph

15695 commits

Author SHA1 Message Date
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
Marc Alexander
37093b6aa5 [ticket/11342] Fix "unexpected token" syntax error
PHPBB-11342
2013-02-20 23:19:25 +01:00
Oleg Pudeyev
3e90082dbb Merge PR #1062 branch 'dhruvgoel92/ticket/11179' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11179:
  [ticket/11179] remove extra & in function call
  [ticket/11179] correct start parameter in sphinx search
  [ticket/11179] correct start parameter in native author search
  [ticket/11179] correct start parameter in native keyword search
  [ticket/11179] fix success query path for postgres
  [ticket/11179] fix success query path for mysql
  [ticket/11179] minor fixes
  [ticket/11179] pass start param by reference in postgres
  [ticket/11179] correct start param in author search of postgres
  [ticket/11179] correct start parameter in psql keyword search
  [ticket/11179] pass start param by reference in author search
  [ticket/11179] correct start parameter for author search
  [ticket/11179] use FOUND_ROWS query to re-search with changed start param
  [ticket/11179] pass start parameter by reference
  [ticket/11179] correct the start parameter while retrieving from cache
  [ticket/11179] add search query in case initial one fails
2013-02-18 18:44:04 -05: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
Oleg Pudeyev
0f89b48820 Merge PR #1236 branch 'dhruvgoel92/ticket/11359' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11359:
  [ticket/11359] html escape sphinx config data
  [ticket/11359] add id attribute to textarea
  [ticket/11359] close span
2013-02-18 04:34:26 -05:00
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
Nathan Guse
d2295b3d1f [ticket/11103] Restore new/unread messages info/link in header (properly)
PHPBB3-11103
2013-02-15 19:27:09 -06:00
Nathan Guse
7ad577a86a [ticket/11103] Add Notification Settings link in flyout menu
PHPBB3-11103
2013-02-15 16:02:33 -06:00
Nathan Guse
cdc766c90f [ticket/11103] Restore new/unread messages info/link in header
PHPBB3-11103
2013-02-15 15:41:34 -06:00
Nathaniel Guse
193a3beb8f [feature/migrations] Fix failing tests (again)
PHPBB3-11318
2013-02-13 21:41:52 -06:00
Nathaniel Guse
283ef6eed4 [ticket/11103] Mark/Unmark All buttons
PHPBB3-11103
2013-02-13 17:20:25 -06:00
Nathaniel Guse
dc9cfcd613 [ticket/11103] Make the number of notifications strong if > 0
PHPBB3-11103
2013-02-13 13:30:05 -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
Andreas Fischer
42b211a4a1 Merge branch 'ticket/erangamapa/11196' into develop-olympus
* ticket/erangamapa/11196:
  [ticket/11196] Changed 401 response message in session.php.
2013-02-12 23:05:59 +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
54e9f7b50a Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103
# By Nathan Guse (28) and others
# Via Andreas Fischer (9) and others
* 'develop' of https://github.com/phpbb/phpbb3: (90 commits)
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
  [feature/migrations] Remove default values from necessary parameters
  [ticket/11201] Revert WLM dropping because it is still used in China.
  [ticket/11220] Improvement to the info pop-up from "list="
  [feature/migrations] Revert unrelated changes to functions.php
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
  [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.
  [ticket/10050] removing prosilver edits
  [ticket/9737] Fix some comments
  [ticket/11337] Abort setup-webserver.sh script when an error occurs.
  [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
  [ticket/11337] Silence nginx config file writing.
  [ticket/11337] php-fpm.conf is no longer owned by root.
  [ticket/11337] Run functional tests on travis using nginx and php-fpm.
  [ticket/11338] Travis CI: Install PHP extension for redis key-value store.
  [ticket/10050] adding .topicrow to template condition
  [ticket/9737] Fix a few minor things in migrations
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/config/tables.yml
2013-02-11 21:37:15 -06:00
Nathaniel Guse
3a68bba2fb [feature/migrations] Fix failing tests
PHPBB3-11318
2013-02-11 21:31:34 -06: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
Nathaniel Guse
daf243026a [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
PHPBB3-11350
2013-02-06 13:08:35 -06:00
Nathan Guse
a665ad5c2e [feature/migrations] Remove user_msnm migration
PHPBB3-9737
2013-02-06 11:35:56 -06:00
Nathan Guse
e4afb68dc3 [feature/migrations] Correct depends_on
PHPBB3-9737
2013-02-06 11:35:56 -06:00
Nathan Guse
58507f250b [feature/migrations] Subdirectories for migration data
Organization will set you free

PHPBB3-9737
2013-02-06 11:35:56 -06:00