Skip to content

V4.6.0 - patch upgrade script #3

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.

Sign up for GitHub

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

Open
dshovchko wants to merge 2 commits into
base: v4.6.0
Choose a base branch
from
+5 −3
Open

V4.6.0 - patch upgrade script #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d1c3e4
fix mistake with Undefined variable
dshovchko Dec 29, 2016
4b0aab4
remove creation of temporary tables and change form element
dshovchko Jan 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions textpattern/lib/l10n_admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ function _l10n_list_filter( $event, $step )
}
}
$languages = join( ',' , $selected );
_l10n_create_temp_textpattern( $languages );
// _l10n_create_temp_textpattern( $languages );
break;
default:
break;
Expand Down Expand Up @@ -1777,7 +1777,9 @@ function _l10n_image_extend ($evt, $stp, $data, $rs) {
if( $field === 'alt' )
{
$r .= '<p class="edit-image-alt-text"><span class="edit-label"><label for="image_alt_text_'.$lang.'">'.gTxt('alt_text').' ['.$full_name.']</label></span>';
$r .= '<span class="edit-value"><input type="text" name="'.$field_name.'" '.$dir.' value="'.$rs[$field_name].'" size="'.INPUT_REGULAR.'" id="image_alt_text_'.$lang.'" /></span></p>'.n;
// $r .= '<span class="edit-value"><input type="text" name="'.$field_name.'" '.$dir.' value="'.$rs[$field_name].'" size="'.INPUT_REGULAR.'" id="image_alt_text_'.$lang.'" /></span></p>'.n;
$r .= '<textarea id="image_caption_'.$lang.'" name="'.$field_name .'" cols="'.INPUT_LARGE.'" rows="'.INPUT_XSMALL.'"'.$dir.'>';
$r .= $rs[$field_name].'</textarea></p>'.n;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion textpattern/vendors/Netcarver/MLP/Kickstart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function l10n_upgrade()
if (txpinterface === 'admin') {
$this->l10n_install_version = get_pref('l10n_version', '', 1);

if (!$dbversion || ($dbversion != $thisversion) || ($l10n_release_version != $installed_l10n_version) || $txp_using_svn) {
if (!$dbversion || ($dbversion != $thisversion) || ($this->l10n_release_version != $this->l10n_install_version) || $txp_using_svn) {
// Dirty: perform upgrade.
// Ensure new indexes are present in case of upgrade.
_l10n_check_index();
Expand Down