Skip to content
Browse files

Merge pull request #544 from suralc/fix-220

Fix #220 - Use protocol relative URL in CGoogleApi
  • Loading branch information...
2 parents c9c3950 + 535a002 commit d4f009cb999414fed1303624c62171c60989b990 @samdark samdark committed
Showing with 7 additions and 2 deletions.
  1. +1 −0 CHANGELOG
  2. +6 −2 framework/web/helpers/CGoogleApi.php
View
1 CHANGELOG
@@ -18,6 +18,7 @@ Version 1.1.11 work in progress
- Enh #171: Added support for PUT and DELETE request tunneled through POST via parameter named _method in POST body (musterknabe)
- Enh #191: Added ability to customize HTML classes of CLinkPager via its public properties (mashingan)
- Enh #206: Added ability to pass CDbCriteria object as AR relation parameter (samdark)
+- Enh #220: The URL pointing to the Google API in CGoogleApi is now protocol relative (suralc)
- Enh #237: The tabs of CTabView now support the property 'visible' (DaSourcerer)
- Enh #266: Add support for HTML5 url, email, number, range and date fields to CHtml (gregmolnar)
- Enh #267: CDbHttpSession is now able to store binary payload such as the output of the igbinary serializer (DaSourcerer, samdark)
View
8 framework/web/helpers/CGoogleApi.php
@@ -9,7 +9,7 @@
*/
/**
- * CGoogleApi provides helper methods to easily access {@link http://code.google.com/apis/ajax/ Google AJAX APIs}.
+ * CGoogleApi provides helper methods to easily access the {@link https://developers.google.com/loader/ Google API loader}.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id$
@@ -17,7 +17,11 @@
*/
class CGoogleApi
{
- public static $bootstrapUrl='http://www.google.com/jsapi';
+ /**
+ * @var string Protocol relative url to the Google API loader which allows easy access
+ * to most of the Google AJAX APIs
+ */
+ public static $bootstrapUrl='//www.google.com/jsapi';
/**
* Renders the jsapi script file.

0 comments on commit d4f009c

Please sign in to comment.
Something went wrong with that request. Please try again.