Merge branch 'sprint/hufangzhou_xuanxuan' into 'master'
* Remove the code. See merge request easycorp/zentaopms!2490
This commit is contained in:
@@ -135,7 +135,6 @@ zentaoxx:
|
||||
sed -i 's/commonModel::getLicensePropertyValue/extCommonModel::getLicensePropertyValue/g' zentaoxx/extension/xuan/im/model/conference.php
|
||||
sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql
|
||||
sed -i "s#\$this->app->getModuleRoot() . 'im/apischeme.json'#\$this->app->getExtensionRoot() . 'xuan/im/apischeme.json'#g" zentaoxx/extension/xuan/im/model.php
|
||||
sed -i "/getModuleExtPath(/ r tools/fixxuan" zentaoxx/framework/xuanxuan.class.php
|
||||
sed -i "s/'..\/..\/common\/view\/header.html.php'/\$$app->getModuleRoot() . 'common\/view\/header.html.php'/g" zentaoxx/extension/xuan/conference/view/admin.html.php
|
||||
sed -i "s/'..\/..\/common\/view\/footer.html.php'/\$$app->getModuleRoot() . 'common\/view\/footer.html.php'/g" zentaoxx/extension/xuan/conference/view/admin.html.php
|
||||
echo "ALTER TABLE \`zt_user\` ADD \`pinyin\` varchar(255) NOT NULL DEFAULT '' AFTER \`realname\`;" >> zentaoxx/db/xuanxuan.sql
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
if(!empty($moduleExtPaths))
|
||||
{
|
||||
$extActionFile = $moduleExtPaths['common'] . $methodName . '.php';
|
||||
if(file_exists($extActionFile))
|
||||
{
|
||||
$control = $extActionFile;
|
||||
}
|
||||
else
|
||||
{
|
||||
$extActionFile = $moduleExtPaths['xuan'] . $methodName . '.php';
|
||||
if(file_exists($extActionFile)) $control = $extActionFile;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user