mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Fix for Plugin/Theme git pull requests.

Browse Source
This commit is contained in:
Cameron
2016-06-25 10:38:05 -07:00
parent d412e7cf75
commit b6194499ce
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/eurl.php
View File

@@ -258,8 +258,8 @@ class eurl_admin_ui extends e_admin_controller_ui
// $sefurl = (!empty($alias)) ? str_replace('{alias}', $alias, $v['sef']) : $v['sef']; // $sefurl = (!empty($alias)) ? str_replace('{alias}', $alias, $v['sef']) : $v['sef'];
$pid = $plug."|".$k; $pid = $plug."|".$k;
$v['regex'] = str_replace("^",$home,$v['regex']); $v['regex'] = preg_replace("/^\^/",$home,$v['regex']);
$aliasForm = $frm->renderInline('e_url_alias['.$plug.']['.$k.']', $pid, 'e_url_alias['.$plug.']['.$k.']', $alias, $alias,'text',null,array('title'=>LAN_EDIT." (".e_LANGUAGE." Only)", 'url'=>e_REQUEST_SELF)); $aliasForm = $frm->renderInline('e_url_alias['.$plug.']['.$k.']', $pid, 'e_url_alias['.$plug.']['.$k.']', $alias, $alias,'text',null,array('title'=>LAN_EDIT." (Language-specific)", 'url'=>e_REQUEST_SELF));
$aliasRender = str_replace('{alias}', $aliasForm, $v['regex']); $aliasRender = str_replace('{alias}', $aliasForm, $v['regex']);
$text .= "<tr> $text .= "<tr>

7
e107_handlers/file_class.php
View File

@@ -1251,6 +1251,8 @@ class e_file
$gitPath = defset('e_GIT','git'); // addo to e107_config.php to $gitPath = defset('e_GIT','git'); // addo to e107_config.php to
$mes = e107::getMessage(); $mes = e107::getMessage();
// $text = 'umask 0022'; //Could correct permissions issue with 0664 files.
// Change Dir. // Change Dir.
switch($type) switch($type)
@@ -1272,18 +1274,17 @@ class e_file
// return $cmd; // return $cmd;
$mes->addDebug($cmd);
$mes->addDebug($cmd); $mes->addDebug($cmd);
$text = `$cmd 2>&1`; $text = `$cmd 2>&1`;
// Remove any local changes. // Remove any local changes.
$cmd = $gitPath.' reset --hard'; $cmd = $gitPath.' --git-dir='.$dir.'/.git reset --hard';
$mes->addDebug($cmd); $mes->addDebug($cmd);
$text .= `$cmd 2>&1`; $text .= `$cmd 2>&1`;
// Run Pull request // Run Pull request
$cmd = $gitPath.' pull'; $cmd = $gitPath.' --git-dir='.$dir.'/.git pull';
$mes->addDebug($cmd); $mes->addDebug($cmd);
$text .= `$cmd 2>&1`; $text .= `$cmd 2>&1`;