powered by nequal
Home » sfJpMobilePlugin » Timeline » 1004

Changeset 1004 -- 2009-07-11 01:31:47

Author
vector
Comment
Merge branch 'master' of git@github.com:vectorxenon/sfJpMobilePlugin Conflicts: config/config_handlers.yml lib/controller/sfJpMobileController.class.php lib/filter/sfJpMobileFilter.class.php

Diffs

sfJpMobilePlugin/trunk/config/config_handlers.yml

@@ -1,12 +1,9 @@
config/jpmobile/emoji/*.yml:
file: %SF_PLUGINS_DIR%/sfJpMobilePlugin/lib/config/sfJpMobileEmojiConfigHandler.class.php
class: sfJpMobileEmojiConfigHandler
-<<<<<<< HEAD:config/config_handlers.yml
-=======
config/jpmobile/istyle.yml:
class: sfDefineEnvironmentConfigHandler
param:
prefix: jpmobile_
->>>>>>> 90b0425adb86dfa39cd2d6136786bebdcf1a378c:config/config_handlers.yml

sfJpMobilePlugin/trunk/lib/controller/sfJpMobileController.class.php

@@ -29,7 +29,7 @@
{
$url = $this->genUrl($url, true);
-    if (!preg_match('/(\?|&)'.preg_quote(SID).'/', $url)) {
+    if (sfJpMobile::isMobile() && !preg_match('/(\?|&)'.preg_quote(SID).'/', $url)) {
$url .= (strpos($url, '?') === false ? '?' : '&') . SID;
}

sfJpMobilePlugin/trunk/lib/filter/sfJpMobileFilter.class.php

@@ -51,6 +51,7 @@
->getAction($context->getModuleName(), $context->getActionName())
->redirect("{$uri}guid=ON");
}
+    apache_note('uid', sfJpMobile::getDevice()->getUid());
}
/**
* パラメータの変換