Permalink
Browse files

Merge branch 'hotfix/350' into develop

Forward port #350
  • Loading branch information...
2 parents bae4355 + 343f0d4 commit 85a1974915eb441abfb599e38355f65866c4ab12 @weierophinney weierophinney committed Oct 4, 2012
@@ -0,0 +1,41 @@
+.. _zend.view.helpers.initial.basepath:
+
+BasePath Helper
+===============
+
+While most *URL*\ s generated by the framework have the base *URL* prepended automatically,
+developers will need to prepend the base *URL* to their own *URL*\ s (usually inside an href
+attribute) in order for paths to resources to be correct.
+
+If you're running on ZF2's MVC base, ``basePath()`` will point to the ``public`` folder of the
+application's root.
+
+Usage of the ``basePath()`` helper is straightforward:
+
+.. code-block:: php
+ :linenos:
+
+ /*
+ * The following assume that the base URL of the page/application is "/mypage".
+ */
+
+ /*
+ * Prints:
+ * <base href="/mypage/" />
+ */
+ <base href="<?php echo $this->basePath(); ?>" />
+
+ /*
+ * Prints:
+ * <link rel="stylesheet" type="text/css" href="/mypage/css/base.css" />
+ */
+ <link rel="stylesheet" type="text/css"
+ href="<?php echo $this->basePath('css/base.css'); ?>" />
+
+.. note::
+
+ For simplicity's sake, we strip out the entry *PHP* file (e.g., "``index.php``") from the base *URL* .
+ However, in some situations this may cause a problem. If one occurs, use
+ ``$this->getHelper('basePath')->setBasePath()`` to manually set the base path.
+
+
@@ -1,37 +0,0 @@
-.. _zend.view.helpers.initial.baseurl:
-
-BaseUrl Helper
-==============
-
-While most *URL*\ s generated by the framework have the base *URL* prepended automatically, developers will need to
-prepend the base *URL* to their own *URL*\ s in order for paths to resources to be correct.
-
-Usage of the BaseUrl helper is very straightforward:
-
-.. code-block:: php
- :linenos:
-
- /*
- * The following assume that the base URL of the page/application is "/mypage".
- */
-
- /*
- * Prints:
- * <base href="/mypage/" />
- */
- <base href="<?php echo $this->baseUrl(); ?>" />
-
- /*
- * Prints:
- * <link rel="stylesheet" type="text/css" href="/mypage/css/base.css" />
- */
- <link rel="stylesheet" type="text/css"
- href="<?php echo $this->baseUrl('css/base.css'); ?>" />
-
-.. note::
-
- For simplicity's sake, we strip out the entry *PHP* file (e.g., "``index.php``") from the base *URL* that was
- contained in ``Zend_Controller``. However, in some situations this may cause a problem. If one occurs, use
- ``$this->getHelper('BaseUrl')->setBaseUrl()`` to set your own BaseUrl.
-
-
@@ -61,7 +61,7 @@ helpers for providing values for, and rendering, the various HTML *<head>* tags,
``TRUE`` (default), individual items will be escaped using the view objects registered escaping mechanisms; pass
a ``FALSE`` value if you want to allow markup in your lists.
-.. include:: zend.view.helpers.base-url.rst
+.. include:: zend.view.helpers.base-path.rst
.. include:: zend.view.helpers.cycle.rst
.. include:: zend.view.helpers.partial.rst
.. include:: zend.view.helpers.placeholder.rst

0 comments on commit 85a1974

Please sign in to comment.