Changeset 11654


Ignore:
Timestamp:
Jul 7, 2011, 11:13:03 AM (10 years ago)
Author:
patdenice
Message:

merge r11653 from branch 2.2 to trunk
No warning with new empty tpl file

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/plugins/LocalFilesEditor/include/tpl.inc.php

    r10348 r11654  
    1515  else
    1616  {
    17     $content_file = "{* " . l10n('locfiledit_newfile') . " *}\n\n";
     17    $content_file = '';
    1818  }
    1919}
     
    5252  {
    5353    $edited_file = $_POST['tpl_parent'] . '/' . $filename;
    54     $content_file = ($_POST['tpl_model'] == '0') ? $new_file['tpl'] : file_get_contents($_POST['tpl_model']);
     54    $content_file = ($_POST['tpl_model'] == '0') ? '' : file_get_contents($_POST['tpl_model']);
    5555  }
    5656}
Note: See TracChangeset for help on using the changeset viewer.