Changeset 19396 for extensions/GooglePlusOne

Timestamp:

Dec 11, 2012, 5:15:15 PM (11 years ago)

Author:

mistic100

Message:

compatible with 'question_mark_in_url'=false, use W3C valid syntax

Location:

extensions/GooglePlusOne

Files:

• button.tpl (modified) (1 diff)
• main.inc.php (modified) (1 diff)

extensions/GooglePlusOne/button.tpl

@@ -1 +1 @@
 {combine_script id='google_plusone' load='footer' path='https://apis.google.com/js/plusone.js'}
 <script type="text/javascript">window.___gcfg = {ldelim}lang: '{$GPLUS1_LANG}'};</script>
-<g:plusone size="{$GPLUS1_SIZE}" annotation="{$GPLUS1_ANNO}"></g:plusone>
+<div class="g-plusone" data-size="{$GPLUS1_SIZE}" data-annotation="{$GPLUS1_ANNO}" data-href="{$GPLUS1_URL}"></div>

extensions/GooglePlusOne/main.inc.php

@@ -29 +29 @@
     );
   
-  // position for index
-  if (script_basename() == 'index')
+  // urls and position
+  if (script_basename() == 'picture')
+  {
+    $template->assign('GPLUS1_URL', get_absolute_root_url().ltrim(duplicate_picture_url(), './'));
+  }
+  else if (script_basename() == 'index')
   {
     $conf['GooglePlusOne']['position'] = 'index';
+    $template->assign('GPLUS1_URL', get_absolute_root_url().ltrim(duplicate_index_url(array(), array('start')), './'));
+  }
+  else
+  {
+    return;
   }