Andreas Fischer
4b42646f36
Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympus
...
* nickvergessen/ticket/10400:
[ticket/10400] Allow forum name to be '0'
2011-10-13 17:05:01 +02:00
Igor Wiedler
3cd8c2507d
[ticket/10307] Return false in mysqli sql_fetchrow on empty result
...
PHPBB3-10307
2011-10-13 16:43:11 +02:00
Igor Wiedler
6698a9cbd6
[ticket/8094] Remove ambiguity of "phpBB has no categories"
...
PHPBB3-8094
2011-10-13 16:25:41 +02:00
Joas Schilling
88aacd0f2c
[ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
...
PHPBB3-10408
2011-10-13 15:52:12 +02:00
Joas Schilling
367bc23009
Merge branch 'develop-olympus' into develop
...
Conflicts:
phpBB/includes/functions.php
2011-10-13 14:46:16 +02:00
Joas Schilling
f94f872624
[ticket/10304] Fix URL for ICQ while view private messages
...
PHPBB3-10304
2011-10-13 13:59:39 +02:00
Igor Wiedler
d4bbfae0d5
[ticket/9898] Encourage patches in README
...
PHPBB3-9898
2011-10-13 11:53:25 +02:00
Igor Wiedler
330b79686a
Merge remote-tracking branch 'ckwalsh/ticket/9661' into develop
...
* ckwalsh/ticket/9661:
[ticket/9661] Remove eval() from functions_privmsgs.php
2011-10-10 23:58:18 +02:00
Joas Schilling
cacb9f2ec5
[ticket/10400] Allow forum name to be '0'
...
PHPBB3-10400
2011-10-07 09:44:31 +02:00
Matt Friedman
2d0f96e8cc
[ticket/10390] Revert back to escaped script tags inside document.write
...
Revert all script tags inside a document.write back to the escaped
version so they won't trip up any XML parsers.
PHPBB3-10390
2011-10-05 21:24:34 -07:00
Vjacheslav Trushkin
b38fbc6d25
[ticket/10397] Pagination inconsistency fix
...
Fixing topic_generate_pagination()
PHPBB3-10397
2011-10-04 12:24:42 +03:00
Vjacheslav Trushkin
12882084d4
[ticket/10397] Pagination inconsistency fix
...
Fixing inconsistency in code generated by generate_pagination()
PHPBB3-10397
2011-10-04 11:55:25 +03:00
Nils Adermann
fbc2442ccd
[feature/extension-manager] Correctly detect and handle directories in finder
...
PHPBB3-10323
2011-09-29 17:20:42 +02:00
Nils Adermann
cffc676f17
[feature/extension-manager] Find dirs with SELF_FIRST setting on iterator
...
PHPBB3-10323
2011-09-29 16:34:17 +02:00
Nils Adermann
f61ee5d6f5
[feature/extension-manager] Make sure the directory pattern matches on windows
...
PHPBB3-10323
2011-09-29 16:15:54 +02:00
Nils Adermann
024a5e710e
[feature/extension-manager] Correctly reset paths in set_template
...
PHPBB3-10323
2011-09-29 16:15:54 +02:00
Nils Adermann
e52022c572
[feature/extension-manager] Make sure named styles are loaded from root dir
...
PHPBB3-10323
2011-09-29 16:15:54 +02:00
Nils Adermann
4d08d769c2
[feature/extension-manager] Fallback template might not always be set
...
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
703fcae382
[feature/extension-manager] Reset all template paths after a set_templates call
...
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
520a5f9295
[feature/extension-manager] Refactoring the structure of extension provider
...
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
482a8c47ea
[feature/extension-manager] Don't use the extension manager during install
...
Template needs to be able to work without extensions.
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
ea46feb115
[feature/extension-manager] Add support for templates in extensions.
...
This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.
Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.
A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
6ea6d50ccb
[feature/extension-manager] Don't cache the phpbb_root_path in the ext manager
...
Otherwise the paths are incorrect from e.g. adm/
PHPBB3-10323
2011-09-29 15:42:49 +02:00
Nils Adermann
6c6a7d7992
[feature/extension-manager] Extract extension provider functionality from cron
...
PHPBB3-10323
2011-09-29 15:42:49 +02:00
Nils Adermann
7d16007d6a
[feature/extension-manager] Prepend the phpbb_root_path if necessary.
...
PHPBB3-10323
2011-09-29 15:42:49 +02:00
Nils Adermann
fd42599191
[feature/extension-manager] Correct formatting of documentation
...
PHPBB3-10323
2011-09-29 15:42:49 +02:00
Nils Adermann
0ea4de4171
[feature/extension-manager] Add support for directories to the extension finder
...
PHPBB3-10323
2011-09-29 15:42:49 +02:00
Nils Adermann
fe4b8818ec
[feature/extension-manager] Always store the full class name as module basename
...
The updater swaps out all basenames.
PHPBB3-10323
2011-09-29 15:42:49 +02:00
Nils Adermann
c785ef7aa7
[feature/extension-manager] Make sure the extension manager works without cache
...
Includes a test for manager without a cache
PHPBB3-10323
2011-09-29 15:42:49 +02:00
Nils Adermann
018a835997
[feature/extension-manager] The default fulltext native backend was renamed
...
This was done to make it autoloadable.
PHPBB3-10323
2011-09-29 15:42:49 +02:00
Nils Adermann
48391d2dde
[feature/extension-manager] Create an extension manager on update and install
...
It's required when adding modules
PHPBB3-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
739e9eb58e
[feature/extension-manager] Make the cache variable name for extensions dynamic
...
Allows multiple instances to use cache simultaneously.
PHPBB3-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
bd1366d62d
[feature/extension-manager] Use _ext for cache - avoids conflict with file ext
...
PHPBB3-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
64827a6623
[feature/extension-manager] Test creation of new extension finder cache
...
PHPBB3-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
34f11a1039
[feature/extension-manager] Correct usage of false cache return value
...
PHPBB3-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
7435f344e2
[feature/extension-manager] Add docblocks for query members of extension finder
...
PHPBB3-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
24ddef2230
[feature/extension-manager] Remove 5.2 incompatible \ in front of SPL classname
...
PHPBB-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
c7a986eccd
[feature/extension-manager] Use an incremental process for enable and purge
...
The enable or purge operation of an extension could take a long time if an
expensive operation needs to be executed on a large set of data. To allow
this to succeed from a web interface with max_execution_time set in the
webserver's php configuration, subsequent requests must continue the
operation started earlier. So individual enable and purge implementations
must be able to spread their work across multiple steps.
PHPBB3-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
897063d3e2
[feature/extension-manager] Add missing sql_freeresult call
...
PHPBB3-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
61df8a87d1
[feature/extension-manager] Allow extensions to define captcha plugins.
...
The base class for captcha plugins has been renamed, but the old name continues
to exist as an empty subclass of it for backwards compatability.
PHPBB3-10323
2011-09-29 15:42:47 +02:00
Nils Adermann
d5a5cdd0d7
[feature/extension-manager] Avoid unecessary loading of acp classes
...
PHPBB3-10323
2011-09-29 15:42:47 +02:00
Nils Adermann
ade496e0f7
[feature/extension-manager] Fix whitespace in acp_modules
...
PHPBB3-10323
2011-09-29 15:42:47 +02:00
Nils Adermann
4844b00777
[feature/extension-manager] Load (A/U/M)CP modules from extensions
...
To avoid large bc breaking changes, modules in the old includes directory
structure still follow the same naming conventions. Modules in extensions
have to be placed in an xcp/ folder and need a _module suffix. The
corresponding info file is in the same directory but with an _info suffix.
PHPBB3-10323
2011-09-29 15:42:47 +02:00
Nils Adermann
f6632fcfd0
[feature/extension-manager] Add filename prefix matching in extension finder
...
PHPBB3-10323
2011-09-29 15:42:47 +02:00
Nils Adermann
60ad0e21b5
[feature/extension-manager] Remove the ext_active index for lack of specificity
...
PHPBB3-10323
2011-09-29 15:42:47 +02:00
Nils Adermann
5d5030a48b
[feature/extension-manager] Remove cron's dependency on the extension manager.
...
Instead a separate cron provider supplies the manager with tasks from the
extension finder.
PHPBB3-10323
2011-09-29 15:42:46 +02:00
Nils Adermann
96209e0224
[feature/extension-manager] The class loader no longer knows about extensions
...
Instead the class loader is instantiated twice. Once with the phpbb_ prefix
and once with the phpbb_ext_ prefix.
PHPBB3-10323
2011-09-29 15:42:46 +02:00
Nils Adermann
989bd9cde7
[feature/extension-manager] Skip phpbb_search_base by checking for get_name()
...
PHPBB3-10323
2011-09-29 15:42:40 +02:00
Nils Adermann
956860c21d
[feature/extension-manager] Never cache extension finder queries in debug mode
...
During development the detection of files should happen immediately and
performance is less of a concern.
PHPBB3-10323
2011-09-29 15:42:40 +02:00
Nils Adermann
dcc5ca5377
[feature/extension-manager] Make search backends loadable from extensions
...
Search backends are now required to be autoloadable. The database updater to
3.1 tries to guess the class name as phpbb_search_<oldname> which works for
the default backends we ship.
PHPBB3-10323
2011-09-29 15:42:40 +02:00