aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2013-02-241-1/+1
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/11361] Make sure that array passed to strtr() has the proper format. Conflicts: phpBB/includes/session.php
| * Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympusNils Adermann2013-02-241-1/+2
| |\ | | | | | | | | | | | | * github-bantu/ticket/11361: [ticket/11361] Make sure that array passed to strtr() has the proper format.
| | * [ticket/11361] Make sure that array passed to strtr() has the proper format.Andreas Fischer2013-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | [ticket/10896] Add missing email validation lost in develop mergeNils Adermann2013-02-241-0/+7
| | | | | | | | | | | | | | | | | | | | | Fix incomplete merge, by adding a piece of code moved to another file in olympus back. PHPBB3-10896
* | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Merge remote-tracking branch 'github-exreaction/ticket/10896' into ↵Nils Adermann2013-02-241-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new validation type to the ACP validate_config_vars function and implements it on the board_contact and board_email settings. PHPBB3-10896
* | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-3/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | [ticket/7262] Add note about set_config() not updating is_dynamic.Andreas Fischer2013-02-241-0/+3
| | | | | | | | | | | | | | | | PHPBB3-7262
| * | | [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().Andreas Fischer2013-02-241-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [ticket/7262] Backport set_config() and set_config_count() docs from develop.Andreas Fischer2013-02-241-2/+16
| | |/ | |/| | | | | | | PHPBB3-7262
* | | [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSIONDavid King2013-02-231-2/+2
| | | | | | | | | | | | PHPBB3-11298
* | | Merge remote-tracking branch 'EXreaction/feature/migrations-extensions' into ↵David King2013-02-233-10/+114
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [feature/migrations] Use getLocalisedMessage() function to get error messageNathan Guse2013-02-151-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11318
| * | | [feature/migrations] Catch and display errors from the migratorNathaniel Guse2013-02-091-7/+21
| | | | | | | | | | | | | | | | PHPBB3-11318
| * | | [feature/migrations] Call revert correctly when purging an extensionNathaniel Guse2013-02-091-8/+13
| | | | | | | | | | | | | | | | PHPBB3-11318
| * | | [feature/migrations] Inject Migrator instead of using the container to fetchNathaniel Guse2013-02-091-7/+8
| | | | | | | | | | | | | | | | PHPBB3-11318
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Nathaniel Guse2013-02-091-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [feature/migrations] Fix path to extension migrationsNathaniel Guse2013-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11318
| * | | | [feature/migrations] Automatically install/revert migrations for extensionsNathan Guse2013-02-061-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrations from ext/ext_name/migrations/ are automatically installed when enabling the extension and automatically reverted when the extension is purged. PHPBB3-11318
| * | | | [feature/migrations] Make the container available to extension installersNathan Guse2013-02-062-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows extensions to load and install migrations easily as per their needs. PHPBB3-11318
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11351' into developDavid King2013-02-235-14/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | | | | [feature/migrations] getLocalisedMessage function for migration exceptionNathan Guse2013-02-151-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11351
| * | | | | [feature/migrations] Fix unfulfillable functionNathaniel Guse2013-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returned unfulfillable name in the wrong place previously PHPBB3-11351
| * | | | | [feature/migrations] getParameters function for migration exceptionNathaniel Guse2013-02-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11351
| * | | | | [feature/migrations] Add language strings for migrations errorsNathaniel Guse2013-02-094-14/+16
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfulfillable returns string of the missing dependency name now if the migration is unfulfillable (this is significantly more helpful). PHPBB3-11351
* | | | | [ticket/11179] remove extra & in function callDhruv2013-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] correct start parameter in sphinx searchDhruv2013-02-191-3/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] correct start parameter in native author searchDhruv2013-02-191-5/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] correct start parameter in native keyword searchDhruv2013-02-191-9/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] fix success query path for postgresDhruv2013-02-191-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional query to check start parameter executed only incase of no results. PHPBB3-11179
* | | | | [ticket/11179] fix success query path for mysqlDhruv2013-02-191-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional query to check start parameter executed only incase of no results. PHPBB3-11179
* | | | | [ticket/11179] minor fixesDhruv2013-02-192-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends comments to start with capitals. Reinsert blank lines which were not supposed to be removed PHPBB3-11179
* | | | | [ticket/11179] pass start param by reference in postgresDhruv2013-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] correct start param in author search of postgresDhruv2013-02-191-0/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] correct start parameter in psql keyword searchDhruv2013-02-191-5/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] pass start param by reference in author searchDhruv2013-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] correct start parameter for author searchDhruv2013-02-191-2/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] use FOUND_ROWS query to re-search with changed start paramDhruv2013-02-191-38/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-11179
* | | | | [ticket/11179] pass start parameter by referenceDhruv2013-02-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | [ticket/11179] correct the start parameter while retrieving from cacheDhruv2013-02-191-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start parameter if not between 0 and the total result count of the cached search results is changed accordingly PHPBB3-11179
* | | | | [ticket/11179] add search query in case initial one failsDhruv2013-02-191-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes the start parameter according to the total search results and executes the search query again to get the results. PHPBB3-11179
* | | | | [ticket/11359] html escape sphinx config dataDhruv2013-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11359
* | | | | [ticket/11359] add id attribute to textareaDhruv2013-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11359
* | | | | [ticket/11359] close spanDhruv2013-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11359
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-02-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | * develop-olympus: [ticket/11196] Changed 401 response message in session.php.
| * | | [ticket/11196] Changed 401 response message in session.php.erangamapa2013-02-121-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | In session.php 401 response message was "Not Authorized". I changed it to "Unauthorized". PHPBB3-11196
* | | Merge remote-tracking branch 'exreaction/ticket/11350' into developIgor Wiedler2013-02-071-1/+1
|\ \ \ | |_|/ |/| | | | | | | | * exreaction/ticket/11350: [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
| * | [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driverNathaniel Guse2013-02-061-1/+1
| | | | | | | | | | | | PHPBB3-11350
* | | Merge remote-tracking branch 'EXreaction/feature/migrations' into developDavid King2013-02-069-0/+2339
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 17:16:15 +0000