Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove md5 twig extension #14305

Merged
merged 1 commit into from May 23, 2018
Merged

Remove md5 twig extension #14305

merged 1 commit into from May 23, 2018

Conversation

@laps15
Copy link
Contributor

@laps15 laps15 commented May 18, 2018

Adapt templates to remove md5 from PhpFuncionsExtension.php

Signed-off-by: Leonardo Strozzi laps15@inf.ufpr.br

Before submitting pull request, please check that every commit:

  • Has proper Signed-Off-By
  • Has commit message which describes it
  • Is needed on it's own, if you have just minor fixes to previous commits, you can squash them
  • Any new functionality is covered by tests
@@ -1,5 +1,6 @@
<tr>
<td class="vmiddle">
<h1>{{ myfield_md5 }}</h1>

This comment has been minimized.

@mauriciofauth

mauriciofauth May 18, 2018
Member

Is this addition intentional?

This comment has been minimized.

@laps15

laps15 May 18, 2018
Author Contributor

Totally unintentional, I was using for debug only.

@@ -654,6 +654,8 @@ protected function displayTableList()
Template::get('database/structure/structure_table_row')
->render(
array(
'table_name_hash' => md5($current_table['TABLE_NAME']),
'db_table_name_hash' => md5($this->db.$current_table['TABLE_NAME']),

This comment has been minimized.

@mauriciofauth

mauriciofauth May 18, 2018
Member

Could you add one space before and after the concat operator?

This comment has been minimized.

@laps15

laps15 May 18, 2018
Author Contributor

Done! There was a '.' missing between the db name ante the table name, fixed that too.

@laps15 laps15 force-pushed the laps15:refactor branch from 2a7cf26 to f8d911c May 18, 2018
@codecov
Copy link

@codecov codecov bot commented May 18, 2018

Codecov Report

Merging #14305 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@             Coverage Diff              @@
##             master   #14305      +/-   ##
============================================
- Coverage     50.45%   50.44%   -0.01%     
- Complexity    14410    14411       +1     
============================================
  Files           502      502              
  Lines         67019    67025       +6     
============================================
- Hits          33814    33813       -1     
- Misses        33205    33212       +7
@laps15 laps15 force-pushed the laps15:refactor branch from f8d911c to 1bc4236 May 18, 2018
@@ -117,7 +117,7 @@
{% set myfield = save_row[i]['Field'] %}
{# Use an md5 as array index to avoid having special characters
in the name attribute (see bug #1746964 ) #}
{% set myfield_md5 = md5(myfield) %}
{% set myfield_md5 = save_row[i]['Hash'] %}

This comment has been minimized.

@mauriciofauth

mauriciofauth May 19, 2018
Member

This value seems to be empty for me.

This comment has been minimized.

@laps15

laps15 May 22, 2018
Author Contributor

Fixed it, it really was empty. Now I'm using the other array (column_array).

Adapt templates to remove md5 from PhpFuncionsExtension.php

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
@laps15 laps15 force-pushed the laps15:refactor branch from 1bc4236 to 927fed7 May 22, 2018
@mauriciofauth mauriciofauth merged commit 2d5825d into phpmyadmin:master May 23, 2018
4 of 6 checks passed
4 of 6 checks passed
codecov/patch 0% of diff hit (target 50.45%)
Details
codecov/project 50.44% (-0.01%) compared to 83f4336
Details
Codacy/PR Quality Review Up to standards. A positive pull request.
Details
DCO All commits have a DCO sign-off from the author
Details
Scrutinizer Analysis: No new issues – Tests: passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@mauriciofauth
Copy link
Member

@mauriciofauth mauriciofauth commented May 23, 2018

Merged, thanks for your contribution!

@mauriciofauth mauriciofauth self-assigned this May 23, 2018
@mauriciofauth mauriciofauth added this to the 5.0.0 milestone May 23, 2018
@williamdes
Copy link
Member

@williamdes williamdes commented May 30, 2018

laps15 added a commit to laps15/phpmyadmin that referenced this pull request May 30, 2018
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
laps15 added a commit to laps15/phpmyadmin that referenced this pull request May 30, 2018
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
laps15 added a commit to laps15/phpmyadmin that referenced this pull request May 30, 2018
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
mauriciofauth added a commit that referenced this pull request May 30, 2018
Fix bug reported on pull request #14305
@laps15 laps15 deleted the laps15:refactor branch Jun 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.