merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
wesias7 · Sep 29, 2013 · 2d3f149 · 2d3f149
1 parent cc47d2b
commit 2d3f149
Show file tree

Hide file tree

Showing 2,046 changed files with 129,430 additions and 126,407 deletions.
diff --git a/.htaccess b/.htaccess
@@ -26,9 +26,6 @@ RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)/(.+)/trackback$ ./index.php?mid=$1&documen
 RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)/(.+)/trackback$ ./index.php?vid=$1&document_srl=$2&key=$3&act=trackback [L]
 RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([0-9]+)/(.+)/trackback$ ./index.php?vid=$1&mid=$2&document_srl=$3&key=$4&act=trackback [L]
 
-# administrator page
-RewriteRule ^admin/?$ ./index.php?module=admin [L]
-
 # document permanent link
 RewriteRule ^([0-9]+)$ ./index.php?document_srl=$1 [L,QSA]
 

diff --git a/addons/adminlogging/adminlogging.addon.php b/addons/adminlogging/adminlogging.addon.php
@@ -1,17 +1,21 @@
 <?php
-if(!defined('__XE__')) exit();
+
+if(!defined('__XE__'))
+	exit();
 
 /**
  * @file adminlogging.addon.php
  * @author NHN ([email protected])
  * @brief Automatic link add-on
- **/
+ */
 $logged_info = Context::get('logged_info');
-$act  = Context::get('act');
-$kind = strpos(strtolower($act),'admin')!==false?'admin':'';
+$act = Context::get('act');
+$kind = strpos(strtolower($act), 'admin') !== false ? 'admin' : '';
 
-if($called_position == 'before_module_proc' && $kind == 'admin' && $logged_info->is_admin == 'Y') {
-	$oAdminloggingController = &getController('adminlogging');
+if($called_position == 'before_module_proc' && $kind == 'admin' && $logged_info->is_admin == 'Y')
+{
+	$oAdminloggingController = getController('adminlogging');
 	$oAdminloggingController->insertLog($this->module, $this->act);
 }
-?>
+/* End of file adminlogging.php */
+/* Location: ./addons/adminlogging */
diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php
@@ -1,12 +1,21 @@
 <?php
-if(!defined('__XE__')) exit();
+
+if(!defined('__XE__'))
+	exit();
 
 /**
  * @file autolink.addon.php
  * @author NHN ([email protected])
  * @brief Automatic link add-on
- **/
-if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC") {
+ */
+if($called_position == 'after_module_proc' && Context::getResponseMethod() != "XMLRPC")
+{
+	if(Mobile::isFromMobilePhone())
+	{
+		Context::addJsFile('./common/js/jquery.min.js', false, '', -1000000);
+		Context::addJsFile('./common/js/xe.min.js', false, '', -1000000);
+	}
 	Context::loadFile(array('./addons/autolink/autolink.js', 'body', '', null), true);
 }
-?>
+/* End of file autolink.addon.php */
+/* Location: ./addons/autolink/autolink.addon.php */
diff --git a/addons/autolink/autolink.spec.html b/addons/autolink/autolink.spec.html
@@ -1,16 +1,16 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
-<html lang="ko" xml:lang="ko" xmlns="http://www.w3.org/1999/xhtml"> 
+<!DOCTYPE html> 
+<html lang="ko"> 
 <head>
-<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+<meta charset="utf-8" />
 <title>Autolink Addon Unit Test</title>
-<link rel="stylesheet" type="text/css" href="../../common/js/unittest/css/JSSpec.css" />
-<script type="text/javascript" src="../../common/js/jquery.js"></script>
-<script type="text/javascript" src="../../common/js/common.js"></script>
-<script type="text/javascript" src="../../common/js/js_app.js"></script>
-<script type="text/javascript" src="autolink.js"></script>
-<script type="text/javascript" src="../../common/js/unittest/JSSpec/diff_match_patch.js"></script>
-<script type="text/javascript" src="../../common/js/unittest/JSSpec/JSSpec.js"></script>
-<script type="text/javascript">// <![CDATA[
+<link rel="stylesheet" href="../../common/js/unittest/css/JSSpec.css" />
+<script src="../../common/js/jquery.js"></script>
+<script src="../../common/js/common.js"></script>
+<script src="../../common/js/js_app.js"></script>
+<script src="autolink.js"></script>
+<script src="../../common/js/unittest/JSSpec/diff_match_patch.js"></script>
+<script src="../../common/js/unittest/JSSpec/JSSpec.js"></script>
+<script>// <![CDATA[
 
 var testParam = null;
 var TestSuite = xe.createPlugin("TestSuite", {