1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-19 23:20:22 +01:00

17456 Commits

Author SHA1 Message Date
Joas Schilling
2071abda1f [ticket/12262] Do not use getExtension()
The method is php 5.3.6+ only.

PHPBB3-12262
2014-03-15 15:13:59 +01:00
Joas Schilling
8aa22550b9 [ticket/12262] Fix location list for acp events with "Locations:"
PHPBB3-12262
2014-03-11 17:44:25 +01:00
Joas Schilling
e1d5702853 [ticket/12262] Also find vars array when it's defined in the trigger_event()
PHPBB3-12262
2014-03-11 17:44:25 +01:00
Joas Schilling
296af6c679 Merge remote-tracking branch 'dhruvgoel92/ticket/11271-develop' into develop
* dhruvgoel92/ticket/11271-develop: (25 commits)
  [ticket/11271] Make path conversion more precise
  [ticket/11271] limit absolute path conversion to attachment links only
  [ticket/11271] Add docblock of feed_generate_content( )
  [ticket/11271] Fix tabs and use !empty( ) instead of count( )
  [ticket/11271] Remove unnecessary inclusion of functions_display
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.
  [ticket/11271] Add the inline images html to content
  [ticket/11271] Use class variable $db instead of global
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  ...
2014-03-11 09:53:52 +01:00
Joas Schilling
4b259e3c82 Merge remote-tracking branch 'dhruvgoel92/ticket/11288-develop' into develop
* dhruvgoel92/ticket/11288-develop:
  [ticket/11288] Add unit test cases for foo-bar like queries
  [ticket/11288] Handle +,- without preceeding whitespace characters
2014-03-11 09:48:24 +01:00
Nathan Guse
052bbf654f Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
  [ticket/12106] Combined first and second sentence
  [ticket/12106] Adds a explaination that admin/mods still able to use the board

Conflicts:
	phpBB/language/en/acp/board.php
2014-03-10 21:51:07 -05:00
Nathan Guse
9aa947f7fb Merge pull request #2105 from Crizz0/ticket/12106
[ticket/12106] Adds a explaination that admin/mods still able to use the...
2014-03-10 21:49:29 -05:00
Nathan Guse
3181c44fc9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10549] Adds language variables

Conflicts:
	phpBB/includes/functions_module.php
2014-03-10 21:44:04 -05:00
Nathan Guse
92b638ed83 Merge pull request #2107 from VSEphpbb/ticket/12117
[ticket/12117] Add get_all_tree_data method to tree class
2014-03-10 21:30:39 -05:00
Nathan Guse
23ea833425 Merge pull request #2101 from nickvergessen/ticket/10763
[ticket/10763] Do not call non-static functions statically
2014-03-10 20:51:20 -05:00
Nathan Guse
f7020fb5d1 Merge pull request #2092 from nickvergessen/ticket/12090
[ticket/12090] Pass route name to url() instead of the url itself
2014-03-10 20:50:08 -05:00
Matt Friedman
4127f92496 [ticket/12117] Select all fields instead of item_basic_data
PHPBB3-12117
2014-03-10 16:06:53 -07:00
Matt Friedman
c1115d9451 [ticket/12117] Add get_all_tree_data method to tree class
PHPBB3-12117
2014-03-10 15:59:45 -07:00
Joas Schilling
235f7c3721 Merge remote-tracking branch 'rxu3/ticket/12224' into develop
* rxu3/ticket/12224:
  [ticket/12224] Add assign_block_vars_array() test.
  [ticket/12224] Add template wrapper method to assign block arrays
2014-03-10 23:49:37 +01:00
Crizzo
957e9aabc3 [ticket/12106] Combined first and second sentence
PHPBB3-12106
2014-03-10 21:19:25 +01:00
Crizzo
13327a13a0 [ticket/12106] Adds a explaination that admin/mods still able to use the board
PHPBB3-12106
2014-03-10 18:50:39 +01:00
Crizzo
ec4c9833ca [ticket/10549] Adds language variables
PHPBB3-10549
2014-03-10 18:35:23 +01:00
Nathan Guse
c169583dc3 Merge pull request #2089 from nickvergessen/ticket/12251
[ticket/12251] Clean up and Enhancement of Custom Profile Fields
2014-03-09 17:26:22 -05:00
Nathan Guse
20723a9315 Merge pull request #2099 from bantu/ticket/12256
[ticket/12256] Selecting founders is fetching $sql instead of $result
2014-03-09 16:55:28 -05:00
Joas Schilling
521c6c7d75 [ticket/10763] Do not call messenger::error() statically
PHPBB3-10763
2014-03-09 22:03:38 +01:00
Joas Schilling
37dace4967 [ticket/10763] Do not call non-static transfer() statically
PHPBB3-10763
2014-03-09 21:53:21 +01:00
Joas Schilling
38aef98a69 [ticket/10763] Fix static calls to non static methods in colour_manager
PHPBB3-10763
2014-03-09 21:42:59 +01:00
Joas Schilling
12dc36903e [ticket/10763] Do not call set_post_visibility() statically
PHPBB3-10763
2014-03-09 21:38:32 +01:00
Forumhulp.com
86845e48a2 [ticket/12256] Selecting founders is fetching $sql instead of $result
PHPBB3-12256
2014-03-09 21:37:44 +01:00
Joas Schilling
bc74819cc9 [ticket/12251] Remove leading whitespace on doc blocks
PHPBB3-12251
2014-03-09 21:13:04 +01:00
Joas Schilling
b29c4c6358 [ticket/12090] Move find() call to container and fix tests
PHPBB3-12090
2014-03-09 19:03:15 +01:00
Joas Schilling
2eb24d0ace [ticket/12090] Split finding routes and returning routes into 2 methods
PHPBB3-12090
2014-03-09 18:38:21 +01:00
Joas Schilling
436b1d3577 [ticket/12090] Fix parameter list of controller helper constructor
PHPBB3-12090
2014-03-09 18:22:32 +01:00
Dhruv
1688d88059 Merge branch 'ticket/11288' into ticket/11288-develop
* ticket/11288:
  [ticket/11288] Handle +,- without preceeding whitespace characters
2014-03-09 22:00:06 +05:30
Dhruv
a3033a4a86 [ticket/11288] Handle +,- without preceeding whitespace characters
PHPBB3-11288
2014-03-09 21:51:34 +05:30
Nathan Guse
72e0fe0b22 Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945-develop' into develop
* remotes/dhruvgoel92/ticket/10945-develop:
  [ticket/10945] Remove mark test incomplete for native search backend
  [ticket/10945] Fix Unit Tests as per new changes to split_keywords
  [ticket/10945] Remove mark test incomplete for mysql and postgres
  [ticket/10945] Fix return values for split_keywords function
  [ticket/10945] Display search query when search fails in native search
  [ticket/10945] remove trigger_error call
2014-03-09 11:15:48 -05:00
Nathan Guse
c305bd25e4 Merge pull request #2074 from Crizz0/ticket/12240
Ticket/12240 - Adds specific class to BBCode-Buttons in Template incl. Custom-BBCode support
2014-03-08 19:20:22 -06:00
Dhruv
8290dd6b1c [ticket/11938] Fix whitespace characters
PHPBB3-11938
2014-03-09 01:17:36 +05:30
Dhruv
1207767bb3 [ticket/11938] use sql_attr_string instead of sql_attr_str2ordinal
PHPBB3-11938
2014-03-09 01:16:13 +05:30
Dhruv
3b6d371310 Merge branch 'ticket/10945' into ticket/10945-develop
* ticket/10945:
  [ticket/10945] Fix return values for split_keywords function
  [ticket/10945] Display search query when search fails in native search
  [ticket/10945] remove trigger_error call

Conflicts:
	phpBB/phpbb/search/fulltext_native.php
2014-03-08 21:44:30 +05:30
Dhruv
c51dcbe6a0 [ticket/10945] Fix return values for split_keywords function
The function now returns false if all the words are common words and true
otherwise.

PHPBB3-10945
2014-03-08 21:23:08 +05:30
Dhruv
b6eec5c142 [ticket/10945] Display search query when search fails in native search
If search fails and common words are present, split_keywords returns false
and search.php file prints appropriate message of common words.
If search fails and there are no common words, split_keywords returns true
and keyword_search returns false so that the search query is displayed in
search box.

PHPBB3-10945
2014-03-08 21:20:37 +05:30
Dhruv Goel
f4645a6376 [ticket/10945] remove trigger_error call
removes trigger_error call incase no search results are found or start
variable exceeds the amount. So that search query is displayed in the
search box even if no results are returned.

PHPBB3-10945
2014-03-08 21:15:51 +05:30
Joas Schilling
07c07171f9 [ticket/12090] Make provider a service and inject it into the helper
PHPBB3-12090
2014-03-08 16:37:22 +01:00
Joas Schilling
275910d8b0 [ticket/12090] Fix pagination for routes
No clickable "jump to" at the moment, as we can not get the route url
by the route name in js yet. Need to find another solution later.

PHPBB3-12090
2014-03-08 16:02:44 +01:00
Dhruv
9100f4ebbf Merge remote-tracking branch 'VarunAgw/ticket/12250' into develop
# By Varun Agrawal
# Via Varun Agrawal
* VarunAgw/ticket/12250:
  [ticket/12250] Remove deprecated phpbb_clean_path function
  [ticket/12250] Remove deprecated phpbb_clean_path function
2014-03-08 18:14:05 +05:30
Joas Schilling
51273f6fb1 [ticket/12090] Pass route name to url() to allow admins to change the routes
PHPBB3-12090
2014-03-07 12:32:38 +01:00
Andreas Fischer
19d0c2abd5 Merge remote-tracking branch 'VSEphpbb/ticket/12248' into develop
* VSEphpbb/ticket/12248:
  [ticket/12248] Restore id attributes to extension details (used by tests)
2014-03-06 23:50:07 +01:00
Varun Agrawal
429c006440 [ticket/12250] Remove deprecated phpbb_clean_path function
The function phpbb_clean_path() in functions.php is deprecated and is
replaced by filesystem class. Therefore, this function is moved to the
functions_compatibility file.

PHPBB3-12250
2014-03-07 03:44:28 +05:30
Matt Friedman
aae22d699e [ticket/12248] Restore id attributes to extension details (used by tests)
PHPBB3-12248
2014-03-06 12:02:27 -08:00
Varun Agrawal
1cf8554d0e [ticket/12250] Remove deprecated phpbb_clean_path function
The function phpbb_clean_path() in functions.php is deprecated as is not
used used 3.0/3.1 core

PHPBB3-12250
2014-03-06 23:51:49 +05:30
Nathan Guse
c40b15ae19 Merge pull request #2087 from marc1706/ticket/12239
[ticket/12239] Move deprecated passwords functions to compatibility file
2014-03-06 07:00:30 -06:00
Joas Schilling
600e5f6c11 [ticket/12251] Add string validation for a-zA-Z0-9 and underscore
PHPBB3-12251
2014-03-06 12:28:36 +01:00
Joas Schilling
50165fe920 [ticket/12251] Load profile fields by default on posts, pms and memberlist
PHPBB3-12251
2014-03-06 12:08:46 +01:00
Joas Schilling
e6f492c7ac [ticket/12251] Enable displaying profile fields on memberlist, posts and pms
PHPBB3-12251
2014-03-06 12:02:11 +01:00