Skip to content

[Ticket/14069] Incorrect sql_fetchfield call in style_update_p1 migration#3810

Closed
marcovo wants to merge 1 commit intophpbb:3.1.xfrom
marcovo:ticket/14069
Closed

[Ticket/14069] Incorrect sql_fetchfield call in style_update_p1 migration#3810
marcovo wants to merge 1 commit intophpbb:3.1.xfrom
marcovo:ticket/14069

Conversation

@marcovo
Copy link
Copy Markdown
Contributor

@marcovo marcovo commented Aug 5, 2015

Corrected the sql_fetch_field() call in style_update_p1 migration

PHPBB3-14069

@marcovo
Copy link
Copy Markdown
Contributor Author

marcovo commented Aug 5, 2015

I don't know whether the commit 'Merge pull request #1 from phpbb/3.1.x' is a problem... it was just to synchronise my fork with the phpBB repository... Is there a better way to do that?

@rxu
Copy link
Copy Markdown
Contributor

rxu commented Aug 5, 2015

Good catch.

@Elsensee
Copy link
Copy Markdown
Contributor

Elsensee commented Aug 5, 2015

Rebasing.

@marcovo
Copy link
Copy Markdown
Contributor Author

marcovo commented Aug 5, 2015

Ok;

  1. The Travis check failed, it says:

Inspecting commit message of commit 3988b42
Unexpected EOF encountered
Aborting commit.

What is wrong with the commit message? Did I overlook something?

  1. How do I rebase? I can find a command I can run in the terminal (git rebase --interactive phpbb:3.1.x) but it doesn't work.. Shouldn't I be able to do this on the github website?

Changed the sql_fetchfield() call to comply to the function definition.
@marcovo
Copy link
Copy Markdown
Contributor Author

marcovo commented Aug 5, 2015

Found how to do rebasing here:
http://stackoverflow.com/questions/7244321/how-to-update-github-forked-repository

I'll try again :)

@marcovo marcovo reopened this Aug 5, 2015
@marcovo marcovo closed this Aug 5, 2015
@iMattPro
Copy link
Copy Markdown
Member

iMattPro commented Aug 5, 2015

The commit message is missing PHPBB3-14069

@marcovo
Copy link
Copy Markdown
Contributor Author

marcovo commented Aug 6, 2015

Yeah I saw it, the new pull request is here:
#3811

Thanks for noting it though :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants