Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Rotua Panjaitan
yii2
Commits
fd8828cf
Commit
fd8828cf
authored
Jun 28, 2014
by
Carsten Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolved naming conflict in apidoc
parent
d8ae74ee
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
ApiMarkdown.php
extensions/apidoc/helpers/ApiMarkdown.php
+2
-2
ApiMarkdownLaTeX.php
extensions/apidoc/helpers/ApiMarkdownLaTeX.php
+2
-2
ApiMarkdownTrait.php
extensions/apidoc/helpers/ApiMarkdownTrait.php
+2
-2
No files found.
extensions/apidoc/helpers/ApiMarkdown.php
View file @
fd8828cf
...
...
@@ -29,7 +29,7 @@ class ApiMarkdown extends GithubMarkdown
*/
public
static
$renderer
;
protected
$
c
ontext
;
protected
$
renderingC
ontext
;
/**
* Renders a code block
...
...
@@ -104,7 +104,7 @@ class ApiMarkdown extends GithubMarkdown
if
(
is_string
(
$context
))
{
$context
=
static
::
$renderer
->
apiContext
->
getType
(
$context
);
}
Markdown
::
$flavors
[
'api'
]
->
c
ontext
=
$context
;
Markdown
::
$flavors
[
'api'
]
->
renderingC
ontext
=
$context
;
if
(
$paragraph
)
{
return
Markdown
::
processParagraph
(
$content
,
'api'
);
...
...
extensions/apidoc/helpers/ApiMarkdownLaTeX.php
View file @
fd8828cf
...
...
@@ -27,7 +27,7 @@ class ApiMarkdownLaTeX extends GithubMarkdown
*/
public
static
$renderer
;
protected
$
c
ontext
;
protected
$
renderingC
ontext
;
protected
function
inlineMarkers
()
{
...
...
@@ -62,7 +62,7 @@ class ApiMarkdownLaTeX extends GithubMarkdown
if
(
is_string
(
$context
))
{
$context
=
static
::
$renderer
->
apiContext
->
getType
(
$context
);
}
Markdown
::
$flavors
[
'api-latex'
]
->
c
ontext
=
$context
;
Markdown
::
$flavors
[
'api-latex'
]
->
renderingC
ontext
=
$context
;
if
(
$paragraph
)
{
return
Markdown
::
processParagraph
(
$content
,
'api-latex'
);
...
...
extensions/apidoc/helpers/ApiMarkdownTrait.php
View file @
fd8828cf
...
...
@@ -14,13 +14,13 @@ use yii\apidoc\models\TypeDoc;
/**
* Class ApiMarkdownTrait
*
* @property TypeDoc $
c
ontext
* @property TypeDoc $
renderingC
ontext
*/
trait
ApiMarkdownTrait
{
protected
function
parseApiLinks
(
$text
)
{
$context
=
$this
->
c
ontext
;
$context
=
$this
->
renderingC
ontext
;
if
(
preg_match
(
'/^\[\[([\w\d\\\\\(\):$]+)(\|[^\]]*)?\]\]/'
,
$text
,
$matches
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment