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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this addition intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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']),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@codecov
Copy link

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

@@ -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'] %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This value seems to be empty for me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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>
@MauricioFauth MauricioFauth merged commit 2d5825d into phpmyadmin:master May 23, 2018
@MauricioFauth
Copy link
Member

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

@laps15 You have maybe introduced a bug.
https://demo.phpmyadmin.net/master-config/tbl_relation.php?db=menagerie&table=event
Screenshot:
selection_027

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 refactor branch June 2, 2018 02:29
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.

None yet

3 participants