diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php index dac7eae5f..752a9349c 100644 --- a/e107_admin/eurl.php +++ b/e107_admin/eurl.php @@ -258,8 +258,8 @@ class eurl_admin_ui extends e_admin_controller_ui // $sefurl = (!empty($alias)) ? str_replace('{alias}', $alias, $v['sef']) : $v['sef']; $pid = $plug."|".$k; - $v['regex'] = str_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)); + $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." (Language-specific)", 'url'=>e_REQUEST_SELF)); $aliasRender = str_replace('{alias}', $aliasForm, $v['regex']); $text .= " diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php index 0c860fb08..4da47e67b 100644 --- a/e107_handlers/file_class.php +++ b/e107_handlers/file_class.php @@ -1251,6 +1251,8 @@ class e_file $gitPath = defset('e_GIT','git'); // addo to e107_config.php to $mes = e107::getMessage(); + + // $text = 'umask 0022'; //Could correct permissions issue with 0664 files. // Change Dir. switch($type) @@ -1272,18 +1274,17 @@ class e_file // return $cmd; - $mes->addDebug($cmd); $mes->addDebug($cmd); $text = `$cmd 2>&1`; // Remove any local changes. - $cmd = $gitPath.' reset --hard'; + $cmd = $gitPath.' --git-dir='.$dir.'/.git reset --hard'; $mes->addDebug($cmd); $text .= `$cmd 2>&1`; // Run Pull request - $cmd = $gitPath.' pull'; + $cmd = $gitPath.' --git-dir='.$dir.'/.git pull'; $mes->addDebug($cmd); $text .= `$cmd 2>&1`;