mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
10,564 Commits 17 Branches 190 Tags
Commit Graph

10564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rxu
18fb3d86cd [ticket/10226] Use is_numeric() instead of preg_replace() 
PHPBB3-10226
 2011-06-21 22:03:19 +08:00
rxu
578f9dffa6 [ticket/10226] Allow mysqli connections via local sockets/pipes 
PHPBB3-10226
 2011-06-21 00:55:10 +08:00
Nils Adermann
fd7e29131e Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
 2011-06-20 00:35:17 +02:00
Nils Adermann
b7069f395b Merge branch 'ticket/bantu/10234' into prep-release-3.0.9 
* ticket/bantu/10234:
  [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
 2011-06-20 00:33:38 +02:00
Andreas Fischer
e0ecd3e118 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10223] Make definition of phpbb_require_updated conditional
 2011-06-20 00:28:35 +02:00
Andreas Fischer
d5c2bbf620 Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9 
* naderman/ticket/10223:
  [ticket/10223] Make definition of phpbb_require_updated conditional
 2011-06-20 00:28:02 +02:00
Andreas Fischer
8c01ed578d [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice" 
PHPBB3-10234
 2011-06-20 00:03:20 +02:00
Nils Adermann
ad5ed9d0ee [ticket/10223] Make definition of phpbb_require_updated conditional 
The automatic updater defines it too and includes database_update.php
for updating which causes an error otherwise.

PHPBB3-10223
 2011-06-20 00:00:30 +02:00
Andreas Fischer
1320bb7bf8 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10223] Replace spaces with tabs
 2011-06-19 23:12:21 +02:00
Andreas Fischer
6a4ca8cad9 Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9 
* naderman/ticket/10223:
  [ticket/10223] Replace spaces with tabs
 2011-06-19 23:11:57 +02:00
Nils Adermann
67fde80fbb [ticket/10223] Replace spaces with tabs 
PHPBB3-10223
 2011-06-19 23:02:59 +02:00
Andreas Fischer
ee2d4f627a Merge remote-tracking branch 'rxu/ticket/10227' into develop-olympus 
* rxu/ticket/10227:
  [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+
 2011-06-19 17:58:36 +02:00
Andreas Fischer
b43907d69e Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
 2011-06-19 17:58:07 +02:00
Andreas Fischer
e2fe25fbdc Merge remote-tracking branch 'naderman/ticket/10232' into prep-release-3.0.9 
* naderman/ticket/10232:
  [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
 2011-06-19 17:57:56 +02:00
Andreas Fischer
4e85731a5f Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10223] The search fid parameter is an array of forums not just an id
  [ticket/10223] Check optional before file_exists and correct require path
  [ticket/10223] requiring the new startup.php file conditionally.
 2011-06-19 17:57:29 +02:00
Andreas Fischer
c4c22d4421 Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9 
* naderman/ticket/10223:
  [ticket/10223] The search fid parameter is an array of forums not just an id
  [ticket/10223] Check optional before file_exists and correct require path
  [ticket/10223] requiring the new startup.php file conditionally.
 2011-06-19 17:56:30 +02:00
rxu
7de078b26e [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+ 
PHPBB3-10227
 2011-06-19 19:03:53 +08:00
Nils Adermann
d37e8dd6d3 [ticket/10223] The search fid parameter is an array of forums not just an id 
PHPBB3-10223
 2011-06-19 00:13:33 +02:00
Nils Adermann
d3f1b60292 [ticket/10223] Check optional before file_exists and correct require path 
PHPBB3-10223
 2011-06-18 23:48:37 +02:00
Nils Adermann
6458a1a16a [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS 
Avoids the global hidden fields from functions.php overwriting local
searches.

PHPBB3-10232
 2011-06-18 23:22:25 +02:00
Andreas Fischer
4ac9bde2d1 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10229] On languge/acp/styles.php "%s" should be %s
 2011-06-18 15:12:38 +02:00
Andreas Fischer
882cb084d7 Merge remote-tracking branch 'Raimon/ticket/10229' into prep-release-3.0.9 
* Raimon/ticket/10229:
  [ticket/10229] On languge/acp/styles.php "%s" should be %s
 2011-06-18 15:11:59 +02:00
Raimon
dd0606a317 [ticket/10229] On languge/acp/styles.php "%s" should be %s 
PHPBB3-10229
 2011-06-18 15:00:39 +02:00
Nils Adermann
1b0821a11b [ticket/10223] requiring the new startup.php file conditionally. 
Added a function for this which we can potentially apply to more of the files in the
installer and database updater.

PHPBB3-10223
 2011-06-18 01:02:58 +02:00
Andreas Fischer
bb1b52947e Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release.
 2011-06-16 16:18:11 +02:00
Andreas Fischer
2bae5298e0 [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release. release-3.0.9-RC2 2011-06-16 16:16:55 +02:00
Andreas Fischer
bd6e27d9c5 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10221] Append unit (seconds) after input field, remove from explanation
 2011-06-16 16:11:27 +02:00
Andreas Fischer
1d349ee5a8 Merge remote-tracking branch 'naderman/ticket/10221' into prep-release-3.0.9 
* naderman/ticket/10221:
  [ticket/10221] Append unit (seconds) after input field, remove from explanation
 2011-06-16 16:11:20 +02:00
Nils Adermann
63b9b91dee [ticket/10221] Append unit (seconds) after input field, remove from explanation 
PHPBB3-10221
 2011-06-16 16:02:34 +02:00
Andreas Fischer
aa0c70058b Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2011-06-15 19:46:28 +02:00
Andreas Fischer
48e5e56146 [prep-release-3.0.9] Bumping version number for 3.0.9-RC2. 2011-06-15 19:41:14 +02:00
Andreas Fischer
79f757d4b7 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10218] Prevent startime from being overwritten by deregister_globals()
  [ticket/10218] Moving global deregistration, etc. to startup.php

Conflicts:
	phpBB/install/database_update.php
 2011-06-15 18:51:04 +02:00
Andreas Fischer
2d6df4c7fc Merge remote-tracking branch 'Marshalrusty/ticket/10218' into prep-release-3.0.9 
* Marshalrusty/ticket/10218:
  [ticket/10218] Prevent startime from being overwritten by deregister_globals()
  [ticket/10218] Moving global deregistration, etc. to startup.php
 2011-06-15 18:50:14 +02:00
Andreas Fischer
1e8c257bd4 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10220] Limit user agent value length for storage in login attempt table
 2011-06-15 18:47:27 +02:00
Andreas Fischer
d2eebd7682 Merge remote-tracking branch 'naderman/ticket/10220' into prep-release-3.0.9 
* naderman/ticket/10220:
  [ticket/10220] Limit user agent value length for storage in login attempt table
 2011-06-15 18:47:26 +02:00
Andreas Fischer
bf3bac8772 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10219] Remove invalid and invisible character from web.config.
 2011-06-15 18:47:24 +02:00
Nils Adermann
74785a8bda [ticket/10220] Limit user agent value length for storage in login attempt table 
PHPBB3-10220
 2011-06-15 18:20:16 +02:00
Igor Wiedler
62a51e681e Merge remote-tracking branch 'bantu/ticket/10219' into prep-release-3.0.9 
* bantu/ticket/10219:
  [ticket/10219] Remove invalid and invisible character from web.config.
 2011-06-15 08:02:00 +02:00
Yuriy Rusko
4bb98fb046 [ticket/10218] Prevent startime from being overwritten by deregister_globals() 
PHPBB3-10218
 2011-06-15 00:50:12 -04:00
Andreas Fischer
bc7aebe0fb [ticket/10219] Remove invalid and invisible character from web.config. 
PHPBB3-10219
 2011-06-14 23:18:33 +02:00
Yuriy Rusko
f8eb154714 [ticket/10218] Moving global deregistration, etc. to startup.php 
Because startup.php deletes all variables, the constants in
database_update are used to preserve settings at the top.

PHPBB3-10218
 2011-06-14 06:11:35 -04:00
Andreas Fischer
bf61602a28 [develop-olympus] Incrementing the version to 3.0.10-dev in develop-olympus. 2011-06-13 22:23:28 +02:00
Andreas Fischer
5223f7558b Merge remote-tracking branch 'naderman/ticket/10214' into develop-olympus 
* naderman/ticket/10214:
  [ticket/10214] Correct Oracle create table query syntax in db_tools
release-3.0.9-RC1 		2011-06-13 19:49:52 +02:00
Nils Adermann
c090e1c9e9 [ticket/10214] Correct Oracle create table query syntax in db_tools 
Removes the semicolon at end of oracle CREATE TABLE queries and adds a
semicolon to the end of a SELECT query inside of the trigger for a new
table's auto increment column before the end keyword

PHPBB3-10214
 2011-06-13 06:14:59 +02:00
Andreas Fischer
7cc45ee0d5 Merge remote-tracking branch 'naderman/ticket/10213' into develop-olympus 
* naderman/ticket/10213:
  [ticket/10213] Update install schema with shorter index names.
 2011-06-13 02:15:35 +02:00
Nils Adermann
47edadfc9e [ticket/10213] Update install schema with shorter index names. 
PHPBB3-10213
 2011-06-13 01:52:18 +02:00
Andreas Fischer
25bd58d2f9 Merge remote-tracking branch 'naderman/ticket/9892' into develop-olympus 
* naderman/ticket/9892:
  [ticket/9892] _sql in the updater needs to return the transaction results
 2011-06-13 00:09:37 +02:00
Nils Adermann
c9e22ac509 [ticket/9892] _sql in the updater needs to return the transaction results 
PHPBB3-9892
 2011-06-12 23:45:23 +02:00
Andreas Fischer
d724c3afac Merge remote-tracking branch 'naderman/ticket/9992' into develop-olympus 
* naderman/ticket/9992:
  [ticket/9992] The table name constant needs to be defined in the updater
 2011-06-12 23:19:37 +02:00
Nils Adermann
b65cf4c8d6 [ticket/9992] The table name constant needs to be defined in the updater 
When the database update is run before updating the files the constant
is not yet defined.

PHPBB3-9992
 2011-06-12 23:09:52 +02:00